diff options
| author | Luis Soares <luis.soares@sun.com> | 2010-02-10 16:01:31 +0000 |
|---|---|---|
| committer | Luis Soares <luis.soares@sun.com> | 2010-02-10 16:01:31 +0000 |
| commit | 563ba7db9b09618c277634fa9431db65414ba942 (patch) | |
| tree | 912b2d6400869607c582535593820f78cb2eb992 /sql/events.cc | |
| parent | 06df9b073d072307adb5ae3334cc3ccb2df24e32 (diff) | |
| download | mariadb-git-563ba7db9b09618c277634fa9431db65414ba942.tar.gz | |
BUG#51021: current_stmt_binlog_row_based not removed in next-mr
Deployed DBUG_ASSERT before the conditional binlog format
restore.
Diffstat (limited to 'sql/events.cc')
| -rw-r--r-- | sql/events.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/events.cc b/sql/events.cc index b5855401368..340ef8c7bd2 100644 --- a/sql/events.cc +++ b/sql/events.cc @@ -377,6 +377,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, sql_print_error("Event Error: An error occurred while creating query string, " "before writing it into binary log."); /* Restore the state of binlog format */ + DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row()); if (save_binlog_row_based) thd->set_current_stmt_binlog_format_row(); DBUG_RETURN(TRUE); @@ -388,6 +389,7 @@ Events::create_event(THD *thd, Event_parse_data *parse_data, } mysql_mutex_unlock(&LOCK_event_metadata); /* Restore the state of binlog format */ + DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row()); if (save_binlog_row_based) thd->set_current_stmt_binlog_format_row(); @@ -511,6 +513,7 @@ Events::update_event(THD *thd, Event_parse_data *parse_data, } mysql_mutex_unlock(&LOCK_event_metadata); /* Restore the state of binlog format */ + DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row()); if (save_binlog_row_based) thd->set_current_stmt_binlog_format_row(); @@ -588,6 +591,7 @@ Events::drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name, bool if_exists) } mysql_mutex_unlock(&LOCK_event_metadata); /* Restore the state of binlog format */ + DBUG_ASSERT(!thd->is_current_stmt_binlog_format_row()); if (save_binlog_row_based) thd->set_current_stmt_binlog_format_row(); DBUG_RETURN(ret); |