database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

BUG#51021: current_stmt_binlog_row_based not removed in next-mr

Browse Source 
Deployed DBUG_ASSERT before the conditional binlog format
restore.
This commit is contained in:
Luis Soares
2010-02-10 16:01:31 +00:00
parent 9ba558302b
commit 7d213e8314
5 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sp.cc
View File

@@ -1136,6 +1136,7 @@ done:
close_thread_tables(thd);
/* 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);
@@ -1195,6 +1196,7 @@ sp_drop_routine(THD *thd, int type, sp_name *name)
close_thread_tables(thd);
/* 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);
@@ -1271,6 +1273,7 @@ sp_update_routine(THD *thd, int type, sp_name *name, st_sp_chistics *chistics)
close_thread_tables(thd);
/* 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);