diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-09 12:10:47 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-09 12:10:47 +0000 |
| commit | f7ebf26881386819946b7303e42a8b6fd3710884 (patch) | |
| tree | deb232a97959000978b5956ed80003a6e217bc22 /sql/log_event.h | |
| parent | 6ef3875bbd54fb82a049af684d0e04eaf5069de1 (diff) | |
| parent | 7a8ab5f4bcfbb3d52262a26c13744ba0a84ae095 (diff) | |
| download | mariadb-git-f7ebf26881386819946b7303e42a8b6fd3710884.tar.gz | |
auto merge from mysql-5.1-rep+3.
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 |