Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam

Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/field.h b/sql/field.h
index 8e00cf013dc..36f494f6e50 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -50,7 +50,8 @@ class Field
   Field(const Item &);				/* Prevent use of these */
   void operator=(Field &);
 public:
-  static void *operator new(size_t size) {return sql_alloc(size); }
+  static void *operator new(size_t size) throw ()
+  { return sql_alloc(size); }
   static void operator delete(void *ptr_arg, size_t size) { TRASH(ptr_arg, size); }
 
   uchar		*ptr;			// Position to field in record