diff options
author | monty@hundin.mysql.fi <> | 2001-09-21 03:38:35 +0300 |
---|---|---|
committer | monty@hundin.mysql.fi <> | 2001-09-21 03:38:35 +0300 |
commit | 5a14bb2a7ee1f5461f73004833fe7439a282de35 (patch) | |
tree | bd27d62de7286eca9070d981c59b7cc1c889d9f1 /sql/log_event.h | |
parent | ea0523bd719e59205cb0259a0977ae6c07a7ca00 (diff) | |
download | mariadb-git-5a14bb2a7ee1f5461f73004833fe7439a282de35.tar.gz |
Integrated table->ref_primary_key into table->part_of_key
Fixed bug in UNION
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index d938bced742..71f0f2a8575 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -272,7 +272,8 @@ public: #else // avoid having to link mysqlbinlog against libpthread static Log_event* read_log_event(IO_CACHE* file); #endif - static Log_event* read_log_event(const char* buf, int event_len); + static Log_event* read_log_event(const char* buf, int event_len, + const char **error); const char* get_type_str(); #ifndef MYSQL_CLIENT @@ -567,9 +568,10 @@ public: uint file_id; #ifndef MYSQL_CLIENT Create_file_log_event(THD* thd, sql_exchange* ex, const char* db_arg, - const char* table_name_arg, - List<Item>& fields_arg, enum enum_duplicates handle_dup, - char* block_arg, uint block_len_arg); + const char* table_name_arg, + List<Item>& fields_arg, + enum enum_duplicates handle_dup, + char* block_arg, uint block_len_arg); #endif Create_file_log_event(const char* buf, int event_len); |