summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-09 23:51:51 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-09 23:51:51 +0100
commit2e11ca36f28133c18b72351d176ee2fd7fcbc465 (patch)
tree5aefb03db444e9c2856c3aba50f2f28e8fa12772 /sql/log_event.h
parenteff07bf08e29afab76c7688ec063ef6881ee464f (diff)
parentd07b5f1ca295d4eb6eeba0b88c93f04e9e21cb5c (diff)
downloadmariadb-git-2e11ca36f28133c18b72351d176ee2fd7fcbc465.tar.gz
mysql-5.1.67 merge
Diffstat (limited to 'sql/log_event.h')
-rw-r--r--sql/log_event.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 7a75e90d82f..bab2ab2a43c 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -2499,7 +2499,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;}
@@ -2511,9 +2511,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)