diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-08-12 13:18:34 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-08-12 13:18:34 +0200 |
| commit | b1a13cb15a2cca5dece24c860f64b5ee012ed199 (patch) | |
| tree | bad79ad136df284bd18281bbfff53a3fe48e8e0a /sql/sql_binlog.cc | |
| parent | c4d69f17753f375e8cfd18c33de291cdf13504f9 (diff) | |
| download | mariadb-git-b1a13cb15a2cca5dece24c860f64b5ee012ed199.tar.gz | |
MWL#234: After-review fixes, including better names for the new system variables.
Diffstat (limited to 'sql/sql_binlog.cc')
| -rw-r--r-- | sql/sql_binlog.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_binlog.cc b/sql/sql_binlog.cc index bb95054a371..319d08d2a96 100644 --- a/sql/sql_binlog.cc +++ b/sql/sql_binlog.cc @@ -33,7 +33,7 @@ void mysql_client_binlog_statement(THD* thd) { - ulonglong save_do_not_replicate; + ulonglong save_skip_replication; DBUG_ENTER("mysql_client_binlog_statement"); DBUG_PRINT("info",("binlog base64: '%*s'", (int) (thd->lex->comment.length < 2048 ? @@ -214,15 +214,15 @@ void mysql_client_binlog_statement(THD* thd) reporting. */ #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) - save_do_not_replicate= thd->options & OPTION_DO_NOT_REPLICATE; - thd->options= (thd->options & ~OPTION_DO_NOT_REPLICATE) | - (ev->flags & LOG_EVENT_DO_NOT_REPLICATE_F ? - OPTION_DO_NOT_REPLICATE : 0); + save_skip_replication= thd->options & OPTION_SKIP_REPLICATION; + thd->options= (thd->options & ~OPTION_SKIP_REPLICATION) | + (ev->flags & LOG_EVENT_SKIP_REPLICATION_F ? + OPTION_SKIP_REPLICATION : 0); err= ev->apply_event(rli); - thd->options= (thd->options & ~OPTION_DO_NOT_REPLICATE) | - save_do_not_replicate; + thd->options= (thd->options & ~OPTION_SKIP_REPLICATION) | + save_skip_replication; #else err= 0; #endif |