mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
merged fixes for BUG#39934 to 5.1-rpl+3
Also renamed current_stmt_binlog_row_based to current_stmt_binlog_format_row for consistency
This commit is contained in:
@ -302,6 +302,7 @@ static void run_query(THD *thd, char *buf, char *end,
|
||||
thd->transaction.all= save_thd_transaction_all;
|
||||
thd->transaction.stmt= save_thd_transaction_stmt;
|
||||
thd->net= save_thd_net;
|
||||
thd->set_current_stmt_binlog_format_row();
|
||||
|
||||
if (thd == injector_thd)
|
||||
{
|
||||
@ -3647,6 +3648,7 @@ pthread_handler_t ndb_binlog_thread_func(void *arg)
|
||||
|
||||
thd= new THD; /* note that contructor of THD uses DBUG_ */
|
||||
THD_CHECK_SENTRY(thd);
|
||||
thd->set_current_stmt_binlog_format_row();
|
||||
|
||||
/* We need to set thd->thread_id before thd->store_globals, or it will
|
||||
set an invalid value for thd->variables.pseudo_thread_id.
|
||||
|
Reference in New Issue
Block a user