diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-19 10:37:25 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-19 10:37:51 +0100 |
| commit | 3a8ca9096ea82ca61811450775511533d6cb1bb4 (patch) | |
| tree | ff1e65b3b40efa8ec000d1e39f4be03106f40c53 /mysql-test/suite/galera/include | |
| parent | 93522bc9a987e756ae1872953af1ddc1731ce9b6 (diff) | |
| parent | 53123dfa3e365138591fd2f160c6057aca00a3e6 (diff) | |
| download | mariadb-git-3a8ca9096ea82ca61811450775511533d6cb1bb4.tar.gz | |
Merge branch 'bb-10.4-release' into bb-10.5-releasemariadb-10.5.9
Diffstat (limited to 'mysql-test/suite/galera/include')
| -rw-r--r-- | mysql-test/suite/galera/include/galera_load_provider.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/include/galera_unload_provider.inc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/include/galera_load_provider.inc b/mysql-test/suite/galera/include/galera_load_provider.inc index 0f843597d9c..b9b201106d7 100644 --- a/mysql-test/suite/galera/include/galera_load_provider.inc +++ b/mysql-test/suite/galera/include/galera_load_provider.inc @@ -1,8 +1,6 @@ --echo Loading wsrep provider ... --disable_query_log ---eval SET GLOBAL wsrep_provider = '$wsrep_provider_orig'; - # # count occurences of successful node starts in error log # diff --git a/mysql-test/suite/galera/include/galera_unload_provider.inc b/mysql-test/suite/galera/include/galera_unload_provider.inc index cd841f51fbc..ed7e9bc41f0 100644 --- a/mysql-test/suite/galera/include/galera_unload_provider.inc +++ b/mysql-test/suite/galera/include/galera_unload_provider.inc @@ -1,7 +1,6 @@ --echo Unloading wsrep provider ... --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` ---let $wsrep_provider_orig = `SELECT @@wsrep_provider` --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` --let $wsrep_error_log_orig = `SELECT @@log_error` if(!$wsrep_log_error_orig) @@ -12,4 +11,4 @@ if(!$wsrep_log_error_orig) } --let LOG_FILE= $wsrep_log_error_orig -SET GLOBAL wsrep_provider = 'none'; +SET GLOBAL wsrep_cluster_address = ''; |