Commit 298202f2 authored by Andrei Elkin's avatar Andrei Elkin

merge bug14275000 fixes to 5.5: sql/log_event.h.

parent 5b6d95e1
...@@ -2562,23 +2562,15 @@ public: ...@@ -2562,23 +2562,15 @@ public:
Item_result type; Item_result type;
uint charset_number; uint charset_number;
bool is_null; bool is_null;
<<<<<<< TREE
uchar flags; uchar flags;
#ifdef MYSQL_SERVER #ifdef MYSQL_SERVER
=======
#ifndef MYSQL_CLIENT
bool deferred; bool deferred;
>>>>>>> MERGE-SOURCE
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(), 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),
<<<<<<< TREE flags(flags_arg), deferred(false)
flags(flags_arg)
=======
deferred(false)
>>>>>>> MERGE-SOURCE
{ is_null= !val; } { is_null= !val; }
void pack_info(Protocol* protocol); void pack_info(Protocol* protocol);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment