bk commit into 5.1 tree (kostja:1.2514)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-25 00:41:27+04:00, kostja@vajra.(none) +2 -0
  Fix warnings.

  sql/item_func.h@stripped, 2007-05-25 00:41:18+04:00, kostja@vajra.(none) +1 -1
    Resolve a warning (wrong initialization order).

  sql/sql_lex.cc@stripped, 2007-05-25 00:41:18+04:00, kostja@vajra.(none) +0 -2
    Make -ansi mode compile.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	vajra.(none)
# Root:	/opt/local/work/mysql-5.1-4968-clean

--- 1.176/sql/item_func.h	2007-05-24 19:33:55 +04:00
+++ 1.177/sql/item_func.h	2007-05-25 00:41:18 +04:00
@@ -1261,7 +1261,7 @@ class Item_func_get_user_var :public Ite
 public:
   LEX_STRING name; // keep it public
   Item_func_get_user_var(LEX_STRING a):
-    Item_func(), name(a), m_cached_result_type(STRING_RESULT) {}
+    Item_func(), m_cached_result_type(STRING_RESULT), name(a) {}
   enum Functype functype() const { return GUSERVAR_FUNC; }
   LEX_STRING get_name() { return name; }
   double val_real();

--- 1.242/sql/sql_lex.cc	2007-05-18 19:03:57 +04:00
+++ 1.243/sql/sql_lex.cc	2007-05-25 00:41:18 +04:00
@@ -1786,8 +1786,6 @@ st_lex::st_lex()
   :result(0), yacc_yyss(0), yacc_yyvs(0),
    sql_command(SQLCOM_END), option_type(OPT_DEFAULT)
 {
-  /* Check that plugins_static_buffer is declared immediately after plugins */
-  compile_time_assert((&plugins + 1) == (DYNAMIC_ARRAY*)plugins_static_buffer);
 
   my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
                          plugins_static_buffer,