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

Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.

Browse Source
This commit is contained in:
unknown
2011-04-01 15:07:10 +02:00
parent 09bd289497 9aa44bb4b3
commit c677fea7d0
1686 changed files with 28389 additions and 42301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_binlog.cc
View File

@ -50,6 +50,13 @@ void mysql_client_binlog_statement(THD* thd)
}
size_t decoded_len= base64_needed_decoded_length(coded_len);
/*
thd->options 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->options;
/*
Allocation
*/
@ -236,6 +243,7 @@ void mysql_client_binlog_statement(THD* thd)
my_ok(thd);
end:
thd->options= thd_options;
rli->clear_tables_to_lock();
my_free(buf, MYF(MY_ALLOW_ZERO_PTR));
DBUG_VOID_RETURN;