diff options
| author | <Li-Bing.Song@sun.com> | 2010-01-31 03:14:29 +0800 |
|---|---|---|
| committer | <Li-Bing.Song@sun.com> | 2010-01-31 03:14:29 +0800 |
| commit | da88c90aa2e81a6e7e36e775b9857bc90be69e98 (patch) | |
| tree | 4680f4154ace2cf00974ad9b0880e7eeac9a6456 /sql/rpl_handler.cc | |
| parent | 2af3baceaf2776ee573e88c5fc980c47407cc550 (diff) | |
| parent | 85589577e728fa3ada5591a6988c1017c105be83 (diff) | |
| download | mariadb-git-da88c90aa2e81a6e7e36e775b9857bc90be69e98.tar.gz | |
Auto Merge fix for bug#50157
Diffstat (limited to 'sql/rpl_handler.cc')
| -rw-r--r-- | sql/rpl_handler.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc index ebd6e4e0c0b..5a406866513 100644 --- a/sql/rpl_handler.cc +++ b/sql/rpl_handler.cc @@ -190,8 +190,8 @@ int Trans_delegate::after_commit(THD *thd, bool all) { Trans_param param; bool is_real_trans= (all || thd->transaction.all.ha_list == 0); - if (is_real_trans) - param.flags |= TRANS_IS_REAL_TRANS; + + param.flags = is_real_trans ? TRANS_IS_REAL_TRANS : 0; Trans_binlog_info *log_info= my_pthread_getspecific_ptr(Trans_binlog_info*, RPL_TRANS_BINLOG_INFO); @@ -218,8 +218,8 @@ int Trans_delegate::after_rollback(THD *thd, bool all) { Trans_param param; bool is_real_trans= (all || thd->transaction.all.ha_list == 0); - if (is_real_trans) - param.flags |= TRANS_IS_REAL_TRANS; + + param.flags = is_real_trans ? TRANS_IS_REAL_TRANS : 0; Trans_binlog_info *log_info= my_pthread_getspecific_ptr(Trans_binlog_info*, RPL_TRANS_BINLOG_INFO); @@ -228,7 +228,7 @@ int Trans_delegate::after_rollback(THD *thd, bool all) param.log_pos= log_info ? log_info->log_pos : 0; int ret= 0; - FOREACH_OBSERVER(ret, after_commit, thd, (¶m)); + FOREACH_OBSERVER(ret, after_rollback, thd, (¶m)); /* This is the end of a real transaction or autocommit statement, we |