From 850eadadc6da7e4bd4df4a8dd211329629ba1a07 Mon Sep 17 00:00:00 2001
From: unknown <kostja@vajra.(none)>
Date: Fri, 25 May 2007 00:41:27 +0400
Subject: [PATCH] Fix warnings.

sql/item_func.h:
  Resolve a warning (wrong initialization order).
sql/sql_lex.cc:
  Make -ansi mode compile.
---
 sql/item_func.h | 2 +-
 sql/sql_lex.cc  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/sql/item_func.h b/sql/item_func.h
index 827bfd56e87..51ffe2133c9 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1261,7 +1261,7 @@ class Item_func_get_user_var :public Item_func,
 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();
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 65e5f8035e4..7c900cf64d3 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -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,