diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-13 17:01:32 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-13 17:01:32 +0100 |
commit | e3a4741d05138d3850c7ed1788e3065c2f34548b (patch) | |
tree | 6514a0ffb792cd133aac6e0062b8c49449f2ab8e /sql/log_event.h | |
parent | cb31d4ccfeae5db50f46bf965cf561222696df02 (diff) | |
parent | 70cafe287e040123d325a82bddcdfe0ee7d613cd (diff) | |
download | mariadb-git-e3a4741d05138d3850c7ed1788e3065c2f34548b.tar.gz |
merge
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 5530444b0d4..81669e24708 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2498,6 +2498,10 @@ private: class User_var_log_event: public Log_event { public: + enum { + UNDEF_F= 0, + UNSIGNED_F= 1 + }; char *name; uint name_len; char *val; @@ -2505,12 +2509,14 @@ public: Item_result type; uint charset_number; bool is_null; + uchar flags; #ifndef MYSQL_CLIENT 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, - uint charset_number_arg) + uint charset_number_arg, uchar flags_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), + flags(flags_arg) { is_null= !val; } void pack_info(Protocol* protocol); #else |