diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-04 08:44:56 +0300 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2021-05-04 11:34:06 +0300 |
commit | 473e85e9316bd1d0c716cf2690a737542a9c35bc (patch) | |
tree | e1f5cb14f6e4b91cc13a666089aaccaa248a6e80 /mysql-test/suite/wsrep/r | |
parent | 0cc811c633d1fe5290b10fa49fad0a4b889383fa (diff) | |
download | mariadb-git-473e85e9316bd1d0c716cf2690a737542a9c35bc.tar.gz |
MDEV-25591 : Test case cleanups
galera_var_wsrep_on_off : Add wait conditions to make sure DDL is
replicated before continuing.
wsrep.[variables|variables_debug] : Remove unnecessary parts
and add check to correct number of variables or skip
galera_ssl_reload: Add version check and SSL checks.
Diffstat (limited to 'mysql-test/suite/wsrep/r')
-rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 136 | ||||
-rw-r--r-- | mysql-test/suite/wsrep/r/variables_debug.result | 137 |
2 files changed, 0 insertions, 273 deletions
diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 97fabd58de6..282c7d78ea9 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -1,9 +1,4 @@ # Correct Galera library found -# -# MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of -# 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 # @@ -74,80 +69,6 @@ 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_cluster_weight # -wsrep_desync_count # -wsrep_evs_delayed # -wsrep_evs_evict_list # -wsrep_evs_repl_latency # -wsrep_evs_state # -wsrep_gcomm_uuid # -wsrep_gmcast_segment # -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 # # Should show nothing. SHOW STATUS LIKE 'x'; Variable_name Value @@ -164,12 +85,6 @@ SHOW STATUS LIKE 'wsrep_thread_count'; Variable_name Value wsrep_thread_count 2 # variables -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -EXPECT_49 -49 -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -EXPECT_49 -49 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; VARIABLE_NAME WSREP_AUTO_INCREMENT_CONTROL @@ -221,54 +136,3 @@ WSREP_START_POSITION WSREP_SYNC_WAIT WSREP_TRX_FRAGMENT_SIZE WSREP_TRX_FRAGMENT_UNIT -SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; -VARIABLE_NAME -WSREP_AUTO_INCREMENT_CONTROL -WSREP_CAUSAL_READS -WSREP_CERTIFICATION_RULES -WSREP_CERTIFY_NONPK -WSREP_CLUSTER_ADDRESS -WSREP_CLUSTER_NAME -WSREP_CONVERT_LOCK_TO_TRX -WSREP_DATA_HOME_DIR -WSREP_DBUG_OPTION -WSREP_DEBUG -WSREP_DESYNC -WSREP_DIRTY_READS -WSREP_DRUPAL_282555_WORKAROUND -WSREP_FORCED_BINLOG_FORMAT -WSREP_GTID_DOMAIN_ID -WSREP_GTID_MODE -WSREP_IGNORE_APPLY_ERRORS -WSREP_LOAD_DATA_SPLITTING -WSREP_LOG_CONFLICTS -WSREP_MAX_WS_ROWS -WSREP_MAX_WS_SIZE -WSREP_MYSQL_REPLICATION_BUNDLE -WSREP_NODE_ADDRESS -WSREP_NODE_INCOMING_ADDRESS -WSREP_NODE_NAME -WSREP_NOTIFY_CMD -WSREP_ON -WSREP_OSU_METHOD -WSREP_PATCH_VERSION -WSREP_PROVIDER -WSREP_PROVIDER_OPTIONS -WSREP_RECOVER -WSREP_REJECT_QUERIES -WSREP_REPLICATE_MYISAM -WSREP_RESTART_SLAVE -WSREP_RETRY_AUTOCOMMIT -WSREP_SLAVE_FK_CHECKS -WSREP_SLAVE_THREADS -WSREP_SLAVE_UK_CHECKS -WSREP_SR_STORE -WSREP_SST_AUTH -WSREP_SST_DONOR -WSREP_SST_DONOR_REJECTS_QUERIES -WSREP_SST_METHOD -WSREP_SST_RECEIVE_ADDRESS -WSREP_START_POSITION -WSREP_SYNC_WAIT -WSREP_TRX_FRAGMENT_SIZE -WSREP_TRX_FRAGMENT_UNIT diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result index 9a140f26ec3..921f262c59c 100644 --- a/mysql-test/suite/wsrep/r/variables_debug.result +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -1,9 +1,4 @@ # Correct Galera library found -# -# MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of -# 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 # @@ -75,81 +70,6 @@ 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_cluster_weight # -wsrep_debug_sync_waiters # -wsrep_desync_count # -wsrep_evs_delayed # -wsrep_evs_evict_list # -wsrep_evs_repl_latency # -wsrep_evs_state # -wsrep_gcomm_uuid # -wsrep_gmcast_segment # -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 # # Should show nothing. SHOW STATUS LIKE 'x'; Variable_name Value @@ -166,12 +86,6 @@ SHOW STATUS LIKE 'wsrep_thread_count'; Variable_name Value wsrep_thread_count 2 # variables -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -EXPECT_49 -49 -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -EXPECT_49 -49 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; VARIABLE_NAME WSREP_AUTO_INCREMENT_CONTROL @@ -223,54 +137,3 @@ WSREP_START_POSITION WSREP_SYNC_WAIT WSREP_TRX_FRAGMENT_SIZE WSREP_TRX_FRAGMENT_UNIT -SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; -VARIABLE_NAME -WSREP_AUTO_INCREMENT_CONTROL -WSREP_CAUSAL_READS -WSREP_CERTIFICATION_RULES -WSREP_CERTIFY_NONPK -WSREP_CLUSTER_ADDRESS -WSREP_CLUSTER_NAME -WSREP_CONVERT_LOCK_TO_TRX -WSREP_DATA_HOME_DIR -WSREP_DBUG_OPTION -WSREP_DEBUG -WSREP_DESYNC -WSREP_DIRTY_READS -WSREP_DRUPAL_282555_WORKAROUND -WSREP_FORCED_BINLOG_FORMAT -WSREP_GTID_DOMAIN_ID -WSREP_GTID_MODE -WSREP_IGNORE_APPLY_ERRORS -WSREP_LOAD_DATA_SPLITTING -WSREP_LOG_CONFLICTS -WSREP_MAX_WS_ROWS -WSREP_MAX_WS_SIZE -WSREP_MYSQL_REPLICATION_BUNDLE -WSREP_NODE_ADDRESS -WSREP_NODE_INCOMING_ADDRESS -WSREP_NODE_NAME -WSREP_NOTIFY_CMD -WSREP_ON -WSREP_OSU_METHOD -WSREP_PATCH_VERSION -WSREP_PROVIDER -WSREP_PROVIDER_OPTIONS -WSREP_RECOVER -WSREP_REJECT_QUERIES -WSREP_REPLICATE_MYISAM -WSREP_RESTART_SLAVE -WSREP_RETRY_AUTOCOMMIT -WSREP_SLAVE_FK_CHECKS -WSREP_SLAVE_THREADS -WSREP_SLAVE_UK_CHECKS -WSREP_SR_STORE -WSREP_SST_AUTH -WSREP_SST_DONOR -WSREP_SST_DONOR_REJECTS_QUERIES -WSREP_SST_METHOD -WSREP_SST_RECEIVE_ADDRESS -WSREP_START_POSITION -WSREP_SYNC_WAIT -WSREP_TRX_FRAGMENT_SIZE -WSREP_TRX_FRAGMENT_UNIT |