diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-23 00:19:41 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-02-23 00:19:41 -0500 |
| commit | 2cdcde93c53a85c34db6b59b5950be6bb0c3225e (patch) | |
| tree | 93d49887a6ced62f6cc03cbae8bf077e5537d084 /storage | |
| parent | 18f160d954dcd77a16a994bba4943212b831acbb (diff) | |
| download | mariadb-git-2cdcde93c53a85c34db6b59b5950be6bb0c3225e.tar.gz | |
Merge sync point from previous commit to XtraDB.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index cea5286a1ab..634e9a1c6a8 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -18529,6 +18529,15 @@ wsrep_innobase_kill_one_trx( (thd && wsrep_thd_query(thd)) ? wsrep_thd_query(thd) : "void"); wsrep_thd_LOCK(thd); + DBUG_EXECUTE_IF("sync.wsrep_after_BF_victim_lock", + { + const char act[]= + "now " + "wait_for signal.wsrep_after_BF_victim_lock"; + DBUG_ASSERT(!debug_sync_set_action(bf_thd, + STRING_WITH_LEN(act))); + };); + if (wsrep_thd_query_state(thd) == QUERY_EXITING) { WSREP_DEBUG("kill trx EXITING for %lu", victim_trx->id); |