merge from 5.1 to 5.5
This commit is contained in:
commit
069f5c7eac
@ -2568,7 +2568,7 @@ public:
|
|||||||
User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg,
|
User_var_log_event(THD* thd_arg, char *name_arg, uint name_len_arg,
|
||||||
char *val_arg, ulong val_len_arg, Item_result type_arg,
|
char *val_arg, ulong val_len_arg, Item_result type_arg,
|
||||||
uint charset_number_arg, uchar flags_arg)
|
uint charset_number_arg, uchar flags_arg)
|
||||||
:Log_event(), name(name_arg), name_len(name_len_arg), val(val_arg),
|
:Log_event(thd_arg,0,0), name(name_arg), name_len(name_len_arg), val(val_arg),
|
||||||
val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg),
|
val_len(val_len_arg), type(type_arg), charset_number(charset_number_arg),
|
||||||
flags(flags_arg), deferred(false)
|
flags(flags_arg), deferred(false)
|
||||||
{ is_null= !val; }
|
{ is_null= !val; }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user