Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc


client/mysqltest.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

6 files changed, 7 insertions, 7 deletions

diff --git a/sql/field.cc b/sql/field.cc
index e8731cb0ea5..eeff2ec9881 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3438,7 +3438,7 @@ int Field_long::store(longlong nr, bool unsigned_val)
   else
   {
     if (nr < 0 && unsigned_val)
-      nr= INT_MAX32+1;                           // Generate overflow
+      nr= ((longlong) INT_MAX32) + 1;           // Generate overflow
     if (nr < (longlong) INT_MIN32) 
     {
       res=(int32) INT_MIN32;
diff --git a/sql/item.h b/sql/item.h
index 10c1eec2db9..4980ea41ee7 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -164,6 +164,7 @@ struct Hybrid_type_traits
   virtual my_decimal *val_decimal(Hybrid_type *val, my_decimal *buf) const;
   virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
   static const Hybrid_type_traits *instance();
+  Hybrid_type_traits() {};
 };
 
 
@@ -185,6 +186,7 @@ struct Hybrid_type_traits_decimal: public Hybrid_type_traits
   { return &val->dec_buf[val->used_dec_buf_no]; }
   virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
   static const Hybrid_type_traits_decimal *instance();
+  Hybrid_type_traits_decimal() {};
 };
 
 
@@ -215,6 +217,7 @@ struct Hybrid_type_traits_integer: public Hybrid_type_traits
   virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const
   { buf->set(val->integer, &my_charset_bin); return buf;}
   static const Hybrid_type_traits_integer *instance();
+  Hybrid_type_traits_integer() {};
 };
 
 
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 3129ce5db45..b56d99cf245 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -545,6 +545,7 @@ struct Hybrid_type_traits_fast_decimal: public
     val->traits->div(val, u);
   }
   static const Hybrid_type_traits_fast_decimal *instance();
+  Hybrid_type_traits_fast_decimal() {};
 };
 
 static const Hybrid_type_traits_fast_decimal fast_decimal_traits_instance;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index fc7bac89274..7e598543a38 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -284,7 +284,7 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
 /* Flag set if setup_tables already done */
 #define OPTION_SETUP_TABLES_DONE        (1L << 30) // intern
 /* If not set then the thread will ignore all warnings with level notes. */
-#define OPTION_SQL_NOTES                (1L << 31) // THD, user
+#define OPTION_SQL_NOTES                (1UL << 31) // THD, user
 /* 
   Force the used temporary table to be a MyISAM table (because we will use
   fulltext functions when reading from it.
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index bb14d22e493..84574bf01b9 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -4787,9 +4787,6 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
   }
   DBUG_RETURN(test(thd->net.report_error));
 
-err:
-  if (arena)
-    thd->restore_active_arena(arena, &backup);
 err_no_arena:
   DBUG_RETURN(1);
 }
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 46740460526..81fc941e809 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5644,8 +5644,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type,
        and so on, the display width is ignored.
     */
     char buf[32];
-    my_snprintf(buf, sizeof(buf),
-                "TIMESTAMP(%s)", length, system_charset_info);
+    my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length);
     push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN,
                         ER_WARN_DEPRECATED_SYNTAX,
                         ER(ER_WARN_DEPRECATED_SYNTAX),