diff options
| author | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-10-12 08:36:09 +0100 |
|---|---|---|
| committer | Nuno Carvalho <nuno.carvalho@oracle.com> | 2012-10-12 08:36:09 +0100 |
| commit | 922792fdff2334a3207f98ff4501c7abd7d92102 (patch) | |
| tree | 583deb38a800d7fb1ec33c797ca6b547bb963757 /sql/log_event.h | |
| parent | 614496d502c67af28db23b6dc57ee21f9e73d717 (diff) | |
| parent | f1d3b0f19011217c13927f44a82e8e17291fbba7 (diff) | |
| download | mariadb-git-922792fdff2334a3207f98ff4501c7abd7d92102.tar.gz | |
BUG#14629727: USER_VAR_EVENT IS MISSING RANGE CHECKS
Merge from mysql-5.1 into mysql-5.5.
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index ac7aa7e9453..1f12b607f5d 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -2577,7 +2577,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;} @@ -2591,7 +2591,7 @@ public: bool is_deferred() { return deferred; } void set_deferred() { deferred= true; } #endif - bool is_valid() const { return 1; } + bool is_valid() const { return name != 0; } private: #if defined(MYSQL_SERVER) && defined(HAVE_REPLICATION) |