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

Manual merge

Browse Source
This commit is contained in:
2010-11-28 18:06:02 +08:00
parent d695e39296 abb201c131
commit 30376d282d
4 changed files with 179 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_binlog.cc
View File

@ -60,6 +60,13 @@ void mysql_client_binlog_statement(THD* thd)
}
size_t decoded_len= base64_needed_decoded_length(coded_len);
/*
option_bits will be changed when applying the event. But we don't expect
it be changed permanently after BINLOG statement, so backup it first.
It will be restored at the end of this function.
*/
ulonglong thd_options= thd->variables.option_bits;
/*
Allocation
*/
@ -246,6 +253,7 @@ void mysql_client_binlog_statement(THD* thd)
my_ok(thd);
end:
thd->variables.option_bits= thd_options;
rli->slave_close_thread_tables(thd);
my_free(buf);
DBUG_VOID_RETURN;