summaryrefslogtreecommitdiff
path: root/sql/transaction.cc
diff options
context:
space:
mode:
authorAndrei Elkin <andrei.elkin@mariadb.com>2017-11-22 19:34:42 +0200
committerMonty <monty@mariadb.org>2017-12-18 13:43:37 +0200
commit74b35b68744ce552f09124e27ef1785af69d7989 (patch)
treeacb3c43dab8f87df9769ca13f15aee19e02a217c /sql/transaction.cc
parente972125f11d8f37bc263b113e85ed064257a92ee (diff)
downloadmariadb-git-74b35b68744ce552f09124e27ef1785af69d7989.tar.gz
MDEV-13073. This part patch weeds out RUN_HOOK from the server as semisync
is defined statically. Consequently the observer interfaces are removed as well.
Diffstat (limited to 'sql/transaction.cc')
-rw-r--r--sql/transaction.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/transaction.cc b/sql/transaction.cc
index f6ccf5a1930..349f4549d31 100644
--- a/sql/transaction.cc
+++ b/sql/transaction.cc
@@ -21,7 +21,6 @@
#include "mariadb.h"
#include "sql_priv.h"
#include "transaction.h"
-#include "rpl_handler.h"
#include "debug_sync.h" // DEBUG_SYNC
#include "sql_acl.h"
#include "semisync_master.h"
@@ -319,14 +318,12 @@ bool trans_commit(THD *thd)
*/
if (res)
{
- (void) RUN_HOOK(transaction, after_rollback, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterRollback(thd, FALSE);
#endif
}
else
{
- (void) RUN_HOOK(transaction, after_commit, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterCommit(thd, FALSE);
#endif
@@ -423,7 +420,6 @@ bool trans_rollback(THD *thd)
~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY);
DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS"));
res= ha_rollback_trans(thd, TRUE);
- (void) RUN_HOOK(transaction, after_rollback, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterRollback(thd, FALSE);
#endif
@@ -540,14 +536,12 @@ bool trans_commit_stmt(THD *thd)
*/
if (res)
{
- (void) RUN_HOOK(transaction, after_rollback, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterRollback(thd, FALSE);
#endif
}
else
{
- (void) RUN_HOOK(transaction, after_commit, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterCommit(thd, FALSE);
#endif
@@ -590,7 +584,6 @@ bool trans_rollback_stmt(THD *thd)
trans_reset_one_shot_chistics(thd);
}
- (void) RUN_HOOK(transaction, after_rollback, (thd, FALSE));
#ifdef HAVE_REPLICATION
repl_semisync_master.waitAfterRollback(thd, FALSE);
#endif