diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:01:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:06:22 +0100 |
| commit | f33e57a9e66f7e1790cb84b141381bb668e281a0 (patch) | |
| tree | 31bb1c5bd8e0addc9e994a1bb42b4703c37f7ed8 /mysql-test/suite/wsrep | |
| parent | 1a0526e2f294acdcac829672794ee1fe708eb2b3 (diff) | |
| parent | 245d33db4e0586df4fe28362fb002cef0151a1c9 (diff) | |
| download | mariadb-git-f33e57a9e66f7e1790cb84b141381bb668e281a0.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'mysql-test/suite/wsrep')
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 9 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 8bb0b426380..df7ca3787aa 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -132,16 +132,7 @@ drop user test@localhost; # SET @wsrep_sst_auth_saved= @@global.wsrep_sst_auth; SET @@global.wsrep_sst_auth= 'user:pass'; -SELECT @@global.wsrep_sst_auth; -@@global.wsrep_sst_auth -******** SET @@global.wsrep_sst_auth= ''; -SELECT @@global.wsrep_sst_auth; -@@global.wsrep_sst_auth -NULL SET @@global.wsrep_sst_auth= NULL; -SELECT @@global.wsrep_sst_auth; -@@global.wsrep_sst_auth -NULL SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved; # End of test. diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 6dc63db12aa..6b767c60979 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -139,11 +139,8 @@ drop user test@localhost; --echo # SET @wsrep_sst_auth_saved= @@global.wsrep_sst_auth; SET @@global.wsrep_sst_auth= 'user:pass'; -SELECT @@global.wsrep_sst_auth; SET @@global.wsrep_sst_auth= ''; -SELECT @@global.wsrep_sst_auth; SET @@global.wsrep_sst_auth= NULL; -SELECT @@global.wsrep_sst_auth; SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved; --source include/galera_wait_ready.inc |