diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/galera_variables_ok.inc | 9 | ||||
| -rw-r--r-- | mysql-test/include/galera_variables_ok_debug.inc | 9 | ||||
| -rw-r--r-- | mysql-test/suite/galera/r/galera_var_wsrep_on_off.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_var_wsrep_on_off.test | 18 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 136 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables_debug.result | 139 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 21 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables_debug.cnf | 7 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables_debug.test | 28 |
11 files changed, 225 insertions, 154 deletions
diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc new file mode 100644 index 00000000000..82c5174bc14 --- /dev/null +++ b/mysql-test/include/galera_variables_ok.inc @@ -0,0 +1,9 @@ +--disable_query_log + +--let $galera_variables_ok = `SELECT COUNT(*) = 49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` + +--if (!$galera_variables_ok) { + --skip Galera number of variables has changed! +} + +--enable_query_log diff --git a/mysql-test/include/galera_variables_ok_debug.inc b/mysql-test/include/galera_variables_ok_debug.inc new file mode 100644 index 00000000000..c9a54724c17 --- /dev/null +++ b/mysql-test/include/galera_variables_ok_debug.inc @@ -0,0 +1,9 @@ +--disable_query_log + +--let $galera_variables_ok = `SELECT COUNT(*) = 50 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'` + +--if (!$galera_variables_ok) { + --skip Galera number of variables has changed! +} + +--enable_query_log diff --git a/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result b/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result index 88cc444106b..98cda08845f 100644 --- a/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result +++ b/mysql-test/suite/galera/r/galera_var_wsrep_on_off.result @@ -23,6 +23,7 @@ COUNT(*) = 1 1 DROP TABLE t1; connection node_1; +connection node_1; START TRANSACTION; SET SESSION wsrep_on=OFF; ERROR 25000: You are not allowed to execute this command in a transaction @@ -54,6 +55,7 @@ f1 connection node_1a; SET GLOBAL wsrep_on = ON; DROP TABLE t1; +connection node_2; connection node_1; SET GLOBAL wsrep_on = OFF; connect node_1b, 127.0.0.1, root, , test, $NODE_MYPORT_1;; @@ -71,6 +73,7 @@ SHOW SESSION VARIABLES LIKE 'wsrep_on'; Variable_name Value wsrep_on ON disconnect node_1b; +connection node_2; connection node_1; SET GLOBAL wsrep_on = OFF; SET SESSION wsrep_on = ON; @@ -101,6 +104,7 @@ f1 1 DROP TABLE t1; connection node_1; +connection node_1; SET SESSION wsrep_on = OFF; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY); INSERT INTO t1 VALUES (1); @@ -125,3 +129,4 @@ Tables_in_test connection node_1; DROP TABLE t1; SET GLOBAL wsrep_on = ON; +connection node_2; diff --git a/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test b/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test index 10517f877ae..25acfe84591 100644 --- a/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test +++ b/mysql-test/suite/galera/t/galera_var_wsrep_on_off.test @@ -30,6 +30,9 @@ SELECT COUNT(*) = 1 FROM t1 WHERE f1 = 3; DROP TABLE t1; +--connection node_1 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc # # Test that variable wsrep_on cannot be changed while in @@ -73,6 +76,10 @@ SELECT * FROM t1; SET GLOBAL wsrep_on = ON; DROP TABLE t1; +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc + # # New connections inherit @@session.wsrep_on from @@global.wsrep_on @@ -93,6 +100,10 @@ SHOW SESSION VARIABLES LIKE 'wsrep_on'; --disconnect node_1b +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't2'; +--source include/wait_condition.inc + # # Can't set @@session.wsrep_on = ON, while @@global.wsrep_on = OFF @@ -131,6 +142,9 @@ SELECT * FROM t1; DROP TABLE t1; +--connection node_1 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc # # Test single statement, multi statement, and @@ -165,3 +179,7 @@ SHOW TABLES; --connection node_1 DROP TABLE t1; SET GLOBAL wsrep_on = ON; + +--connection node_2 +--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; +--source include/wait_condition.inc diff --git a/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result b/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result index 541822797b7..1daf3bedf4f 100644 --- a/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result +++ b/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result @@ -1,5 +1,6 @@ connection node_2; connection node_1; +# Correct Galera library found connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; connection node_1; connection node_2; diff --git a/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test index 0c22a58b3e9..714d4b3f75c 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test @@ -3,7 +3,11 @@ # --source include/galera_cluster.inc ---source include/have_innodb.inc +--source include/have_openssl.inc +--source include/have_ssl_communication.inc + +--let $galera_version=26.4.8 +source ../../wsrep/include/check_galera_version.inc; --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index f27114989a5..73bb18bd214 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 -52 -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -EXPECT_49 -51 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; VARIABLE_NAME WSREP_AUTO_INCREMENT_CONTROL @@ -189,59 +104,8 @@ WSREP_FORCED_BINLOG_FORMAT WSREP_GTID_DOMAIN_ID WSREP_GTID_MODE WSREP_GTID_SEQ_NO -WSREP_IGNORE_APPLY_ERRORS -WSREP_LOAD_DATA_SPLITTING -WSREP_LOG_CONFLICTS -WSREP_MAX_WS_ROWS -WSREP_MAX_WS_SIZE WSREP_MODE -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_STRICT_DDL -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 diff --git a/mysql-test/suite/wsrep/r/variables_debug.result b/mysql-test/suite/wsrep/r/variables_debug.result new file mode 100644 index 00000000000..921f262c59c --- /dev/null +++ b/mysql-test/suite/wsrep/r/variables_debug.result @@ -0,0 +1,139 @@ +# Correct Galera library found +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 # +# Should show nothing. +SHOW STATUS LIKE 'x'; +Variable_name Value +SELECT @@global.wsrep_cluster_address; +@@global.wsrep_cluster_address +gcomm:// +SELECT @@global.wsrep_on; +@@global.wsrep_on +1 +SHOW STATUS LIKE 'threads_connected'; +Variable_name Value +Threads_connected 1 +SHOW STATUS LIKE 'wsrep_thread_count'; +Variable_name Value +wsrep_thread_count 2 +# variables +SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_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/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 8b94275a646..249fba48d44 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -4,36 +4,23 @@ --source include/galera_no_debug_sync.inc --let $galera_version=26.4.8 -source ../../wsrep/include/check_galera_version.inc; +source include/check_galera_version.inc; ---echo # ---echo # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of ---echo # variables when using "_" ---echo # - -CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*"); +source include/galera_variables_ok.inc; --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. SHOW STATUS LIKE 'x'; SELECT @@global.wsrep_cluster_address; SELECT @@global.wsrep_on; + SHOW STATUS LIKE 'threads_connected'; SHOW STATUS LIKE 'wsrep_thread_count'; --echo # variables -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; -SELECT COUNT(*) AS EXPECT_49 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%"; SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; -SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; + diff --git a/mysql-test/suite/wsrep/t/variables_debug.cnf b/mysql-test/suite/wsrep/t/variables_debug.cnf new file mode 100644 index 00000000000..b1c96d2614d --- /dev/null +++ b/mysql-test/suite/wsrep/t/variables_debug.cnf @@ -0,0 +1,7 @@ +!include ../my.cnf + +[mysqld.1] +wsrep-on=ON +wsrep-cluster-address=gcomm:// +wsrep-provider=@ENV.WSREP_PROVIDER +binlog-format=ROW diff --git a/mysql-test/suite/wsrep/t/variables_debug.test b/mysql-test/suite/wsrep/t/variables_debug.test new file mode 100644 index 00000000000..c48c2d895b9 --- /dev/null +++ b/mysql-test/suite/wsrep/t/variables_debug.test @@ -0,0 +1,28 @@ +--source include/have_wsrep.inc +--source include/force_restart.inc +--source include/have_innodb.inc +--source include/have_debug.inc +--source include/have_debug_sync.inc +--source include/galera_have_debug_sync.inc + +--let $galera_version=26.4.8 +source include/check_galera_version.inc; + +source include/galera_variables_ok.inc; + +--replace_column 2 # +SHOW GLOBAL STATUS LIKE 'wsrep%'; + +--echo # Should show nothing. +SHOW STATUS LIKE 'x'; + +SELECT @@global.wsrep_cluster_address; +SELECT @@global.wsrep_on; + +SHOW STATUS LIKE 'threads_connected'; +SHOW STATUS LIKE 'wsrep_thread_count'; + +--echo # variables + +SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME LIKE "wsrep%" ORDER BY VARIABLE_NAME; + |