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 MWL#234: @@skip_replication feature to MariaDB 5.5.

Browse Source
This commit is contained in:
unknown
2012-03-01 12:41:49 +01:00
parent 4e8bb265fe 9313032283
commit 22a504f897
23 changed files with 1159 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_binlog.cc
View File

@ -44,6 +44,7 @@
void mysql_client_binlog_statement(THD* thd)
{
ulonglong save_skip_replication;
DBUG_ENTER("mysql_client_binlog_statement");
DBUG_PRINT("info",("binlog base64: '%*s'",
(int) (thd->lex->comment.length < 2048 ?
@ -225,7 +226,17 @@ void mysql_client_binlog_statement(THD* thd)
reporting.
*/
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
save_skip_replication= thd->variables.option_bits&OPTION_SKIP_REPLICATION;
thd->variables.option_bits=
(thd->variables.option_bits & ~OPTION_SKIP_REPLICATION) |
(ev->flags & LOG_EVENT_SKIP_REPLICATION_F ?
OPTION_SKIP_REPLICATION : 0);
err= ev->apply_event(rli);
thd->variables.option_bits=
(thd->variables.option_bits & ~OPTION_SKIP_REPLICATION) |
save_skip_replication;
#else
err= 0;
#endif