diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-25 23:00:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:38:27 +0200 |
| commit | 3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98 (patch) | |
| tree | d08462d84d10324bd05836c968288d8ab1739e11 /sql/sql_update.cc | |
| parent | b04f848176b0d8af41eb3627ba1b6ed4dd3327e3 (diff) | |
| download | mariadb-git-3620910eeac8f118c9a6cb8a1c0ec23e56fb5d98.tar.gz | |
cleanup: galera merge, simple changes
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index c458f01303d..88b6c53b00e 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -976,8 +976,7 @@ int mysql_update(THD *thd, */ if ((error < 0) || thd->transaction.stmt.modified_non_trans_table) { - if (IF_WSREP((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()), - mysql_bin_log.is_open())) + if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) { int errcode= 0; if (error < 0) @@ -2220,8 +2219,7 @@ void multi_update::abort_result_set() The query has to binlog because there's a modified non-transactional table either from the query's list or via a stored routine: bug#13270,23333 */ - if (IF_WSREP((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()), - mysql_bin_log.is_open())) + if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) { /* THD::killed status might not have been set ON at time of an error @@ -2490,8 +2488,7 @@ bool multi_update::send_eof() if (local_error == 0 || thd->transaction.stmt.modified_non_trans_table) { - if (IF_WSREP((WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()), - mysql_bin_log.is_open())) + if (WSREP_EMULATE_BINLOG(thd) || mysql_bin_log.is_open()) { int errcode= 0; if (local_error == 0) |