diff options
| author | unknown <sven@riska.(none)> | 2008-02-04 14:37:34 +0100 |
|---|---|---|
| committer | unknown <sven@riska.(none)> | 2008-02-04 14:37:34 +0100 |
| commit | d4e3ab9cf6b1f6455687117e37ad4d8e61e65fbc (patch) | |
| tree | 9de5c7f5f21dc8265df8c9c5eb07403492b762b2 /sql/sql_binlog.cc | |
| parent | c89590f15743c6a0fc9362cc031d2baf4373f5b3 (diff) | |
| parent | ed9e73077dd9562b77485fc034f5e3b7688b5dd0 (diff) | |
| download | mariadb-git-d4e3ab9cf6b1f6455687117e37ad4d8e61e65fbc.tar.gz | |
Merge riska.(none):/home/sven/bktip/5.1-new-rpl
into riska.(none):/home/sven/bk/b34141-mysqlbinlog_4.1_binlogs/5.1-new-rpl
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index 543b1af9fc0..778aa46149c 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -159,14 +159,13 @@ void mysql_client_binlog_statement(THD* thd) */ if (!have_fd_event) { - if (bufptr[EVENT_TYPE_OFFSET] == FORMAT_DESCRIPTION_EVENT) + int type = bufptr[EVENT_TYPE_OFFSET]; + if (type == FORMAT_DESCRIPTION_EVENT || type == START_EVENT_V3) have_fd_event= TRUE; else { my_error(ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT, - MYF(0), - Log_event::get_type_str( - (Log_event_type)bufptr[EVENT_TYPE_OFFSET])); + MYF(0), Log_event::get_type_str((Log_event_type)type)); goto end; } } |