diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:46:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:48:08 +0200 |
| commit | 4b3690b50433a169d9feed5dc45044a8934b5582 (patch) | |
| tree | 9f89068a76a0afcd6592a4b80e415a0aa237ed1a | |
| parent | 67cb7ea22ac1a510dcbaf9bc48f0f8cf9e0ce8f5 (diff) | |
| download | mariadb-git-4b3690b50433a169d9feed5dc45044a8934b5582.tar.gz | |
fixup 67cb7ea22ac1a510dcbaf9bc48f0f8cf9e0ce8f5
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index f793a510baf..1c427b34d2b 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -43,7 +43,7 @@ SET GLOBAL wsrep_provider=none; call mtr.add_suppression("WSREP: Failed to get provider options"); SELECT @@global.wsrep_provider; @@global.wsrep_provider -/usr/lib/libgalera_4_smm.so +libgalera_smm.so SELECT @@global.wsrep_slave_threads; @@global.wsrep_slave_threads 1 @@ -62,7 +62,7 @@ wsrep_thread_count 0 SELECT @@global.wsrep_provider; @@global.wsrep_provider -/usr/lib/libgalera_4_smm.so +libgalera_smm.so SELECT @@global.wsrep_cluster_address; @@global.wsrep_cluster_address @@ -92,7 +92,7 @@ EXPECT_2 2 SELECT @@global.wsrep_provider; @@global.wsrep_provider -/usr/lib/libgalera_4_smm.so +libgalera_smm.so SELECT @@global.wsrep_cluster_address; @@global.wsrep_cluster_address gcomm:// diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index d69ee5f1de4..cae2fe5d6db 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -70,7 +70,7 @@ call mtr.add_suppression("WSREP: Failed to get provider options"); eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; --enable_query_log ---replace_regex /.*libgalera_smm.*/libgalera_smm.so/ +--replace_regex /.*libgalera.*smm.*/libgalera_smm.so/ SELECT @@global.wsrep_provider; SELECT @@global.wsrep_slave_threads; SELECT @@global.wsrep_cluster_address; @@ -83,7 +83,7 @@ SHOW STATUS LIKE 'wsrep_thread_count'; eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; --enable_query_log ---replace_regex /.*libgalera_smm.*/libgalera_smm.so/ +--replace_regex /.*libgalera.*smm.*/libgalera_smm.so/ SELECT @@global.wsrep_provider; SELECT @@global.wsrep_cluster_address; SELECT @@global.wsrep_on; @@ -106,7 +106,7 @@ SELECT VARIABLE_VALUE AS EXPECT_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VA SELECT VARIABLE_VALUE AS EXPECT_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_rollbacker_thread_count'; SELECT VARIABLE_VALUE AS EXPECT_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_thread_count'; ---replace_regex /.*libgalera_smm.*/libgalera_smm.so/ +--replace_regex /.*libgalera.*smm.*/libgalera_smm.so/ SELECT @@global.wsrep_provider; SELECT @@global.wsrep_cluster_address; SELECT @@global.wsrep_on; |