diff options
author | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-10 15:40:21 +0100 |
commit | 4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch) | |
tree | 568cd8f2997888d5c1035ad8e9b5e823197dcf62 /sql/log_event.h | |
parent | b0ee31c89480519490537b89dca1e8cc65e2b73b (diff) | |
parent | bd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff) | |
download | mariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz |
5.2->5.3 merge
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 62ee63996d0..c8c3cbbbfb4 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2603,7 +2603,7 @@ public: void print(FILE* file, PRINT_EVENT_INFO* print_event_info); #endif - User_var_log_event(const char* buf, + User_var_log_event(const char* buf, uint event_len, const Format_description_log_event *description_event); ~User_var_log_event() {} Log_event_type get_type_code() { return USER_VAR_EVENT;} @@ -2615,9 +2615,9 @@ public: and which case the applier adjusts execution path. */ bool is_deferred() { return deferred; } - void set_deferred() { deferred= val; } + void set_deferred() { deferred= true; } #endif - bool is_valid() const { return 1; } + bool is_valid() const { return name != 0; } private: #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) |