diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2017-11-25 18:54:42 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-12-18 13:43:38 +0200 |
| commit | f279d3c43aa7536b0f9bf46df8f4a3ef02918be0 (patch) | |
| tree | 8b030839b7b1017a8caf948a5991bd610e0e1c6b /sql/transaction.cc | |
| parent | 6a84e3407df448b28230602ca4e748c85bce52bc (diff) | |
| download | mariadb-git-f279d3c43aa7536b0f9bf46df8f4a3ef02918be0.tar.gz | |
MDEV-13073. This part converts the Ali patch`s identifiers to the MariaDB standard. Also some renaming is done as well as white spaces removal.
Diffstat (limited to 'sql/transaction.cc')
| -rw-r--r-- | sql/transaction.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc index 349f4549d31..ec277e9c9c4 100644 --- a/sql/transaction.cc +++ b/sql/transaction.cc @@ -319,13 +319,13 @@ bool trans_commit(THD *thd) if (res) { #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterRollback(thd, FALSE); + repl_semisync_master.wait_after_rollback(thd, FALSE); #endif } else { #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterCommit(thd, FALSE); + repl_semisync_master.wait_after_commit(thd, FALSE); #endif } thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); @@ -421,7 +421,7 @@ bool trans_rollback(THD *thd) DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); res= ha_rollback_trans(thd, TRUE); #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterRollback(thd, FALSE); + repl_semisync_master.wait_after_rollback(thd, FALSE); #endif thd->variables.option_bits&= ~(OPTION_BEGIN | OPTION_KEEP_LOG); /* Reset the binlog transaction marker */ @@ -537,13 +537,13 @@ bool trans_commit_stmt(THD *thd) if (res) { #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterRollback(thd, FALSE); + repl_semisync_master.wait_after_rollback(thd, FALSE); #endif } else { #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterCommit(thd, FALSE); + repl_semisync_master.wait_after_commit(thd, FALSE); #endif } @@ -585,7 +585,7 @@ bool trans_rollback_stmt(THD *thd) } #ifdef HAVE_REPLICATION - repl_semisync_master.waitAfterRollback(thd, FALSE); + repl_semisync_master.wait_after_rollback(thd, FALSE); #endif thd->transaction.stmt.reset(); |