diff options
| author | kostja@vajra.(none) <> | 2007-05-25 00:41:27 +0400 |
|---|---|---|
| committer | kostja@vajra.(none) <> | 2007-05-25 00:41:27 +0400 |
| commit | 7db7a83f945a42fb68d28d77e7c8d9c9c7ade0a7 (patch) | |
| tree | 803cb72d84e63f0034c3d9bd7e6be08b8b7e089b /sql | |
| parent | 338181186a3e564d29fe4d113ae4e19a2326d223 (diff) | |
| download | mariadb-git-7db7a83f945a42fb68d28d77e7c8d9c9c7ade0a7.tar.gz | |
Fix warnings.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.h | 2 | ||||
| -rw-r--r-- | sql/sql_lex.cc | 2 |
2 files changed, 1 insertions, 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, |