mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge four.local.lan:/WORK/mysql-5.1-runtime/src-clean

Browse source 
into  four.local.lan:/WORK/mysql-5.1-runtime/src-1
This commit is contained in:
unknown 2007-05-25 11:47:09 +02:00
commit a9edb06221
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/item_func.h
View file

@ -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();

2
sql/sql_lex.cc
View file

@ -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,