diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-06-12 08:26:32 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-06-12 08:26:32 +0300 |
| commit | cf78b8c699d8394a52c55b38e67a865d6a44c500 (patch) | |
| tree | 49d8e0535143bf5aa5374a2fba4aef42d606ae8e | |
| parent | b42dbdbccd3b939394ca9b608ad91a04235e95f1 (diff) | |
| parent | 34b38ad726025b3ede5db0f5b7dfaaafc8d1e754 (diff) | |
| download | mariadb-git-cf78b8c699d8394a52c55b38e67a865d6a44c500.tar.gz | |
Merge 10.2 into 10.3
| -rw-r--r-- | mysql-test/suite/wsrep/r/mdev_10186.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/mdev_10186.test | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mysql-test/suite/wsrep/r/mdev_10186.result b/mysql-test/suite/wsrep/r/mdev_10186.result index 778c064d208..a21e77a2595 100644 --- a/mysql-test/suite/wsrep/r/mdev_10186.result +++ b/mysql-test/suite/wsrep/r/mdev_10186.result @@ -5,7 +5,4 @@ SELECT @@wsrep_on; @@wsrep_on 0 -SELECT @@GLOBAL.wsrep_provider; -@@GLOBAL.wsrep_provider -libgalera_smm.so SET @@GLOBAL.wsrep_cluster_address='gcomm://'; diff --git a/mysql-test/suite/wsrep/t/mdev_10186.test b/mysql-test/suite/wsrep/t/mdev_10186.test index 98ea5192634..63d34db7c42 100644 --- a/mysql-test/suite/wsrep/t/mdev_10186.test +++ b/mysql-test/suite/wsrep/t/mdev_10186.test @@ -7,7 +7,5 @@ --echo # SELECT @@wsrep_on; ---replace_regex /.*libgalera_smm.so/libgalera_smm.so/ -SELECT @@GLOBAL.wsrep_provider; SET @@GLOBAL.wsrep_cluster_address='gcomm://'; |