Fix warnings.
sql/item_func.h: Resolve a warning (wrong initialization order). sql/sql_lex.cc: Make -ansi mode compile.
This commit is contained in:
parent
16de4981e1
commit
850eadadc6
@ -1261,7 +1261,7 @@ class Item_func_get_user_var :public Item_func,
|
|||||||
public:
|
public:
|
||||||
LEX_STRING name; // keep it public
|
LEX_STRING name; // keep it public
|
||||||
Item_func_get_user_var(LEX_STRING a):
|
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; }
|
enum Functype functype() const { return GUSERVAR_FUNC; }
|
||||||
LEX_STRING get_name() { return name; }
|
LEX_STRING get_name() { return name; }
|
||||||
double val_real();
|
double val_real();
|
||||||
|
@ -1786,8 +1786,6 @@ st_lex::st_lex()
|
|||||||
:result(0), yacc_yyss(0), yacc_yyvs(0),
|
:result(0), yacc_yyss(0), yacc_yyvs(0),
|
||||||
sql_command(SQLCOM_END), option_type(OPT_DEFAULT)
|
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),
|
my_init_dynamic_array2(&plugins, sizeof(plugin_ref),
|
||||||
plugins_static_buffer,
|
plugins_static_buffer,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user