Commit ef58dcfc authored by He Zhenxing's avatar He Zhenxing

auto merge

parents 7bf8e29b 29cc45d0
...@@ -208,6 +208,7 @@ void mysql_client_binlog_statement(THD* thd) ...@@ -208,6 +208,7 @@ void mysql_client_binlog_statement(THD* thd)
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
if (apply_event_and_update_pos(ev, thd, thd->rli_fake, FALSE)) if (apply_event_and_update_pos(ev, thd, thd->rli_fake, FALSE))
{ {
delete ev;
/* /*
TODO: Maybe a better error message since the BINLOG statement TODO: Maybe a better error message since the BINLOG statement
now contains several events. now contains several events.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment