database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merged fix for BUG#39934 up a few revisions.

Browse Source 
NOTE: This undoes changes by BUG#42829 in sql_class.cc:binlog_query().
I will revert the change in a post-push fix (the binlog filter should
be checked in sql_base.cc:decide_logging_format()).
This commit is contained in:
Sven Sandberg
2009-07-14 22:12:27 +02:00
parent 5b178e9a2a f3985c649d
commit 45f724ec54
110 changed files with 4967 additions and 6363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_parse.cc
View File

@ -5624,6 +5624,12 @@ bool my_yyoverflow(short **yyss, YYSTYPE **yyvs, ulong *yystacksize)
void mysql_reset_thd_for_next_command(THD *thd)
{
thd->reset_for_next_command();
}
void THD::reset_for_next_command()
{
THD *thd= this;
DBUG_ENTER("mysql_reset_thd_for_next_command");
DBUG_ASSERT(!thd->spcont); /* not for substatements of routines */
DBUG_ASSERT(! thd->in_sub_stmt);
@ -5667,15 +5673,12 @@ void mysql_reset_thd_for_next_command(THD *thd)
thd->rand_used= 0;
thd->sent_row_count= thd->examined_row_count= 0;
/*
Because we come here only for start of top-statements, binlog format is
constant inside a complex statement (using stored functions) etc.
*/
thd->reset_current_stmt_binlog_row_based();
thd->binlog_warning_flags= 0;
DBUG_PRINT("debug",
("current_stmt_binlog_row_based: %d",
thd->current_stmt_binlog_row_based));
thd->is_current_stmt_binlog_format_row()));
DBUG_VOID_RETURN;
}