Merge branch '10.1' into bb-10.1-release

mysql-test/suite/wsrep/r/variables.result

@@ -19,6 +19,7 @@ SET GLOBAL wsrep_provider=none;
 # variables when using "_"
 #
 CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*");
+# wsrep
 SHOW GLOBAL STATUS LIKE 'wsrep%';
 Variable_name	Value
 wsrep_apply_oooe	#
@@ -59,65 +60,6 @@ wsrep_local_send_queue_min	#
 wsrep_local_state	#
 wsrep_local_state_comment	#
 wsrep_local_state_uuid	#
-wsrep_open_connections	#
-wsrep_open_transactions	#
-wsrep_protocol_version	#
-wsrep_provider_name	#
-wsrep_provider_vendor	#
-wsrep_provider_version	#
-wsrep_ready	#
-wsrep_received	#
-wsrep_received_bytes	#
-wsrep_repl_data_bytes	#
-wsrep_repl_keys	#
-wsrep_repl_keys_bytes	#
-wsrep_repl_other_bytes	#
-wsrep_replicated	#
-wsrep_replicated_bytes	#
-wsrep_thread_count	#
-
-SHOW GLOBAL STATUS LIKE 'wsrep_%';
-Variable_name	Value
-wsrep_apply_oooe	#
-wsrep_apply_oool	#
-wsrep_apply_window	#
-wsrep_causal_reads	#
-wsrep_cert_deps_distance	#
-wsrep_cert_index_size	#
-wsrep_cert_interval	#
-wsrep_cluster_conf_id	#
-wsrep_cluster_size	#
-wsrep_cluster_state_uuid	#
-wsrep_cluster_status	#
-wsrep_commit_oooe	#
-wsrep_commit_oool	#
-wsrep_commit_window	#
-wsrep_connected	#
-wsrep_flow_control_paused	#
-wsrep_flow_control_paused_ns	#
-wsrep_flow_control_recv	#
-wsrep_flow_control_sent	#
-wsrep_incoming_addresses	#
-wsrep_last_committed	#
-wsrep_local_bf_aborts	#
-wsrep_local_cached_downto	#
-wsrep_local_cert_failures	#
-wsrep_local_commits	#
-wsrep_local_index	#
-wsrep_local_recv_queue	#
-wsrep_local_recv_queue_avg	#
-wsrep_local_recv_queue_max	#
-wsrep_local_recv_queue_min	#
-wsrep_local_replays	#
-wsrep_local_send_queue	#
-wsrep_local_send_queue_avg	#
-wsrep_local_send_queue_max	#
-wsrep_local_send_queue_min	#
-wsrep_local_state	#
-wsrep_local_state_comment	#
-wsrep_local_state_uuid	#
-wsrep_open_connections	#
-wsrep_open_transactions	#
 wsrep_protocol_version	#
 wsrep_provider_name	#
 wsrep_provider_vendor	#

mysql-test/suite/wsrep/t/variables.test

@@ -35,13 +35,11 @@ source include/check_galera_version.inc;
 --enable_result_log
 --enable_query_log
 
+--echo # wsrep
+--sorted_result
 --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';