diff options
Diffstat (limited to 'mysql-test/suite/wsrep')
| -rw-r--r-- | mysql-test/suite/wsrep/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/my.cnf | 2 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/mdev_7798.result | 13 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/r/variables.result | 8 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/mdev_7798.opt | 1 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/mdev_7798.test | 17 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 2 |
7 files changed, 42 insertions, 2 deletions
diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def new file mode 100644 index 00000000000..605f063f967 --- /dev/null +++ b/mysql-test/suite/wsrep/disabled.def @@ -0,0 +1 @@ +foreign_key : MDEV-7915 diff --git a/mysql-test/suite/wsrep/my.cnf b/mysql-test/suite/wsrep/my.cnf index 8c5c9851cac..7e51b0750a1 100644 --- a/mysql-test/suite/wsrep/my.cnf +++ b/mysql-test/suite/wsrep/my.cnf @@ -8,5 +8,5 @@ wsrep-on=1 #galera_port=@OPT.port #ist_port=@OPT.port #sst_port=@OPT.port -wsrep_provider_options='base_port=@mysqld.1.#galera_port' +wsrep_provider_options='base_port=@mysqld.1.#galera_port;gcache.size=10M' wsrep_cluster_address='not empty but invalid' diff --git a/mysql-test/suite/wsrep/r/mdev_7798.result b/mysql-test/suite/wsrep/r/mdev_7798.result new file mode 100644 index 00000000000..83a02f3a606 --- /dev/null +++ b/mysql-test/suite/wsrep/r/mdev_7798.result @@ -0,0 +1,13 @@ +# +# MDEV-7798: mysql.server init script can't stop mysqld when WSREP is +# turned off +# +SELECT @@GLOBAL.WSREP_ON; +@@GLOBAL.WSREP_ON +1 +SET GLOBAL WSREP_ON= 0; +Restart the node. +SELECT @@GLOBAL.WSREP_ON; +@@GLOBAL.WSREP_ON +1 +# End of test. diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result index 8ddba797d7c..62d7f62440f 100644 --- a/mysql-test/suite/wsrep/r/variables.result +++ b/mysql-test/suite/wsrep/r/variables.result @@ -49,9 +49,13 @@ 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 # @@ -100,9 +104,13 @@ 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 # diff --git a/mysql-test/suite/wsrep/t/mdev_7798.opt b/mysql-test/suite/wsrep/t/mdev_7798.opt new file mode 100644 index 00000000000..459a9702707 --- /dev/null +++ b/mysql-test/suite/wsrep/t/mdev_7798.opt @@ -0,0 +1 @@ +--wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --wsrep_causal_reads=ON diff --git a/mysql-test/suite/wsrep/t/mdev_7798.test b/mysql-test/suite/wsrep/t/mdev_7798.test new file mode 100644 index 00000000000..9dfff0959bc --- /dev/null +++ b/mysql-test/suite/wsrep/t/mdev_7798.test @@ -0,0 +1,17 @@ +--source include/have_wsrep_provider.inc +--source include/have_binlog_format_row.inc + +--echo # +--echo # MDEV-7798: mysql.server init script can't stop mysqld when WSREP is +--echo # turned off +--echo # + +SELECT @@GLOBAL.WSREP_ON; +SET GLOBAL WSREP_ON= 0; + +--echo Restart the node. +--source include/restart_mysqld.inc + +SELECT @@GLOBAL.WSREP_ON; + +--echo # End of test. diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index 5e195f5c4ab..d77dc4e66f9 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -29,7 +29,7 @@ CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*") --disable_query_log eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; ---let $galera_version=25.3.5 +--let $galera_version=3.9 source include/check_galera_version.inc; --enable_query_log |