Clean up wsrep.variables

2 files changed, 3 insertions, 136 deletions

diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result
index a9988fd1628..f793a510baf 100644
--- a/mysql-test/suite/wsrep/r/variables.result
+++ b/mysql-test/suite/wsrep/r/variables.result
@@ -20,131 +20,6 @@ SET GLOBAL wsrep_provider=none;
 # variables when using "_"
 #
 CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*");
-SHOW GLOBAL STATUS LIKE 'wsrep%';
-Variable_name	Value
-wsrep_local_state_uuid	#
-wsrep_protocol_version	#
-wsrep_last_committed	#
-wsrep_replicated	#
-wsrep_replicated_bytes	#
-wsrep_repl_keys	#
-wsrep_repl_keys_bytes	#
-wsrep_repl_data_bytes	#
-wsrep_repl_other_bytes	#
-wsrep_received	#
-wsrep_received_bytes	#
-wsrep_local_commits	#
-wsrep_local_cert_failures	#
-wsrep_local_replays	#
-wsrep_local_send_queue	#
-wsrep_local_send_queue_max	#
-wsrep_local_send_queue_min	#
-wsrep_local_send_queue_avg	#
-wsrep_local_recv_queue	#
-wsrep_local_recv_queue_max	#
-wsrep_local_recv_queue_min	#
-wsrep_local_recv_queue_avg	#
-wsrep_local_cached_downto	#
-wsrep_flow_control_paused_ns	#
-wsrep_flow_control_paused	#
-wsrep_flow_control_sent	#
-wsrep_flow_control_recv	#
-wsrep_flow_control_active	#
-wsrep_flow_control_requested	#
-wsrep_cert_deps_distance	#
-wsrep_apply_oooe	#
-wsrep_apply_oool	#
-wsrep_apply_window	#
-wsrep_commit_oooe	#
-wsrep_commit_oool	#
-wsrep_commit_window	#
-wsrep_local_state	#
-wsrep_local_state_comment	#
-wsrep_cert_index_size	#
-wsrep_causal_reads	#
-wsrep_cert_interval	#
-wsrep_open_transactions	#
-wsrep_open_connections	#
-wsrep_incoming_addresses	#
-wsrep_applier_thread_count	#
-wsrep_cluster_capabilities	#
-wsrep_cluster_conf_id	#
-wsrep_cluster_size	#
-wsrep_cluster_state_uuid	#
-wsrep_cluster_status	#
-wsrep_connected	#
-wsrep_local_bf_aborts	#
-wsrep_local_index	#
-wsrep_provider_capabilities	#
-wsrep_provider_name	#
-wsrep_provider_vendor	#
-wsrep_provider_version	#
-wsrep_ready	#
-wsrep_rollbacker_thread_count	#
-wsrep_thread_count	#
-
-SHOW GLOBAL STATUS LIKE 'wsrep_%';
-Variable_name	Value
-wsrep_local_state_uuid	#
-wsrep_protocol_version	#
-wsrep_last_committed	#
-wsrep_replicated	#
-wsrep_replicated_bytes	#
-wsrep_repl_keys	#
-wsrep_repl_keys_bytes	#
-wsrep_repl_data_bytes	#
-wsrep_repl_other_bytes	#
-wsrep_received	#
-wsrep_received_bytes	#
-wsrep_local_commits	#
-wsrep_local_cert_failures	#
-wsrep_local_replays	#
-wsrep_local_send_queue	#
-wsrep_local_send_queue_max	#
-wsrep_local_send_queue_min	#
-wsrep_local_send_queue_avg	#
-wsrep_local_recv_queue	#
-wsrep_local_recv_queue_max	#
-wsrep_local_recv_queue_min	#
-wsrep_local_recv_queue_avg	#
-wsrep_local_cached_downto	#
-wsrep_flow_control_paused_ns	#
-wsrep_flow_control_paused	#
-wsrep_flow_control_sent	#
-wsrep_flow_control_recv	#
-wsrep_flow_control_active	#
-wsrep_flow_control_requested	#
-wsrep_cert_deps_distance	#
-wsrep_apply_oooe	#
-wsrep_apply_oool	#
-wsrep_apply_window	#
-wsrep_commit_oooe	#
-wsrep_commit_oool	#
-wsrep_commit_window	#
-wsrep_local_state	#
-wsrep_local_state_comment	#
-wsrep_cert_index_size	#
-wsrep_causal_reads	#
-wsrep_cert_interval	#
-wsrep_open_transactions	#
-wsrep_open_connections	#
-wsrep_incoming_addresses	#
-wsrep_applier_thread_count	#
-wsrep_cluster_capabilities	#
-wsrep_cluster_conf_id	#
-wsrep_cluster_size	#
-wsrep_cluster_state_uuid	#
-wsrep_cluster_status	#
-wsrep_connected	#
-wsrep_local_bf_aborts	#
-wsrep_local_index	#
-wsrep_provider_capabilities	#
-wsrep_provider_name	#
-wsrep_provider_vendor	#
-wsrep_provider_version	#
-wsrep_ready	#
-wsrep_rollbacker_thread_count	#
-wsrep_thread_count	#
 SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment';
 Variable_name	Value
 wsrep_local_state_comment	#
@@ -168,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
-libgalera_smm.so
+/usr/lib/libgalera_4_smm.so
 SELECT @@global.wsrep_slave_threads;
 @@global.wsrep_slave_threads
 1
@@ -187,7 +62,7 @@ wsrep_thread_count	0
 
 SELECT @@global.wsrep_provider;
 @@global.wsrep_provider
-libgalera_smm.so
+/usr/lib/libgalera_4_smm.so
 SELECT @@global.wsrep_cluster_address;
 @@global.wsrep_cluster_address
 
@@ -217,7 +92,7 @@ EXPECT_2
 2
 SELECT @@global.wsrep_provider;
 @@global.wsrep_provider
-libgalera_smm.so
+/usr/lib/libgalera_4_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 f2c3a0a3b78..d69ee5f1de4 100644
--- a/mysql-test/suite/wsrep/t/variables.test
+++ b/mysql-test/suite/wsrep/t/variables.test
@@ -1,7 +1,6 @@
 --source include/have_wsrep.inc
 --source include/force_restart.inc
 --source include/have_innodb.inc
---source include/galera_have_debug_sync.inc
 
 call mtr.add_suppression("WSREP: Initial position was provided by configuration or SST, avoiding override");
 
@@ -37,13 +36,6 @@ eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER';
 --enable_query_log
 
 --replace_column 2 #
-SHOW GLOBAL STATUS LIKE 'wsrep%';
-
---echo
---replace_column 2 #
-SHOW GLOBAL STATUS LIKE 'wsrep_%';
-
---replace_column 2 #
 SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment';
 
 --echo # Should show nothing.