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 /sql/mysqld.cc | |
| 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 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index e2cc7390385..ff3faaa92bc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5781,8 +5781,10 @@ int mysqld_main(int argc, char **argv) set_user(mysqld_user, user_info); } +#ifdef WITH_WSREP if (WSREP_ON && wsrep_check_opts()) global_system_variables.wsrep_on= 0; +#endif if (opt_bin_log && !global_system_variables.server_id) { |