diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 09:40:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-27 09:40:51 +0300 |
| commit | 6be05ceb05609b1aa7382776b4e27ad134808eca (patch) | |
| tree | 1f5a061bd8d38ae19e9c784a558e128c16c5d036 /mysql-test/suite/galera/t/MW-86-wait1.test | |
| parent | 758fbec6e3dd5f640c6e2eb1a78675e369540adc (diff) | |
| download | mariadb-git-6be05ceb05609b1aa7382776b4e27ad134808eca.tar.gz | |
MDEV-22203: WSREP_ON is unnecessarily expensive to evaluate
This is a backport of the applicable part of
commit 93475aff8de80a0ef53cbee924bcb70de6e86f2c and
commit 2c39f69d34e64a5cf94720e82e78c0ee91bd4649
from 10.4.
Before 10.4 and Galera 4, WSREP_ON is a macro that points to
a global Boolean variable, so it is not that expensive to
evaluate, but we will add an unlikely() hint around it.
WSREP_ON_NEW: Remove. This macro was introduced in
commit c863159c320008676aff978a7cdde5732678f975
when reverting WSREP_ON to its previous definition.
We replace some use of WSREP_ON with WSREP(thd), like it was done
in 93475aff8de80a0ef53cbee924bcb70de6e86f2c. Note: the macro
WSREP() in 10.1 is equivalent to WSREP_NNULL() in 10.4.
Item_func_rand::seed_random(): Avoid invoking current_thd
when WSREP is not enabled.
Diffstat (limited to 'mysql-test/suite/galera/t/MW-86-wait1.test')
| -rw-r--r-- | mysql-test/suite/galera/t/MW-86-wait1.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/t/MW-86-wait1.test b/mysql-test/suite/galera/t/MW-86-wait1.test index 40a7882829b..a7476b74e68 100644 --- a/mysql-test/suite/galera/t/MW-86-wait1.test +++ b/mysql-test/suite/galera/t/MW-86-wait1.test @@ -5,6 +5,7 @@ # --source include/galera_cluster.inc --source include/have_binlog_format_row.inc +--source include/have_debug.inc --source include/have_debug_sync.inc --connection node_2 |