diff options
| author | Julius Goryavsky <sysprg@gmail.com> | 2019-01-30 15:16:36 +0100 |
|---|---|---|
| committer | Julius Goryavsky <sysprg@gmail.com> | 2019-01-30 22:28:23 +0100 |
| commit | c9f0a4a9bf52dedb229c7b12eee05db2b08a0289 (patch) | |
| tree | 773d66aeaaa744adddeb9c87501e2effdc46855d /mysql-test/include | |
| parent | 36be0a5aef0376c526d68007da1c11ac440f0d8b (diff) | |
| download | mariadb-git-c9f0a4a9bf52dedb229c7b12eee05db2b08a0289.tar.gz | |
MDEV-18426: Most of the mtr tests in the galera_3nodes suite fail
Most of the mtr tests in the galera_3nodes suite fail
for a variety of reasons with a variety of errors.
Some tests simply need to add the missing "connection"
lines to the result files, but many of them fail due
to substantial errors that require reworking test files.
This patch adds the missing "connection" lines to
the result files and fixes several substantial flaws
in the galera_3nodes suite tests and in the mtr framework
service files, adapting the tests from galera_3nodes
for the current version of MariaDB.
https://jira.mariadb.org/browse/MDEV-18426
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/galera_resume.inc | 9 | ||||
| -rw-r--r-- | mysql-test/include/galera_suspend.inc | 14 | ||||
| -rw-r--r-- | mysql-test/include/mtr_check.sql | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/mysql-test/include/galera_resume.inc b/mysql-test/include/galera_resume.inc new file mode 100644 index 00000000000..af8f2b956fd --- /dev/null +++ b/mysql-test/include/galera_resume.inc @@ -0,0 +1,9 @@ +--echo Resuming node ... +--perl + my $pid_filename = $ENV{'_SUSPEND_NODE_PIDFILE'}; + my $mysqld_pid = `cat $pid_filename`; + chomp($mysqld_pid); + system("kill -SIGCONT $mysqld_pid"); + exit(0); +EOF + diff --git a/mysql-test/include/galera_suspend.inc b/mysql-test/include/galera_suspend.inc new file mode 100644 index 00000000000..d4037d8958c --- /dev/null +++ b/mysql-test/include/galera_suspend.inc @@ -0,0 +1,14 @@ +# +# This macro suspends the current node +# + +--let _SUSPEND_NODE_PIDFILE = `SELECT @@pid_file` +--echo Suspending node ... + +--perl + my $pid_filename = $ENV{'_SUSPEND_NODE_PIDFILE'}; + my $mysqld_pid = `cat $pid_filename`; + chomp($mysqld_pid); + system("kill -SIGSTOP $mysqld_pid"); + exit(0); +EOF diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index f2c0b70e192..9f29222c969 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -35,6 +35,7 @@ BEGIN AND variable_name != 'INNODB_BUFFER_POOL_LOAD_AT_STARTUP' AND variable_name not like 'GTID%POS' AND variable_name != 'GTID_BINLOG_STATE' + AND variable_name != 'AUTO_INCREMENT_INCREMENT' ORDER BY variable_name; -- Dump all databases, there should be none |