diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:21:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2016-12-30 08:53:54 +0200 |
| commit | 341c375d4bddf0e5c381954606ca18be3b8c55e0 (patch) | |
| tree | 00356c65c0af0da40049fe6c05989c2210061f54 /mysql-test/include | |
| parent | f2fe65106f731df48072a16eea3cda0a903d7fe5 (diff) | |
| parent | dc9f5dfcbb8efbc7c1f178313f945981b01d229b (diff) | |
| download | mariadb-git-341c375d4bddf0e5c381954606ca18be3b8c55e0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/kill_mysqld.inc | 7 | ||||
| -rw-r--r-- | mysql-test/include/sync_slave_sql_with_io.inc | 4 | ||||
| -rw-r--r-- | mysql-test/include/wait_for_slave_param.inc | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/include/kill_mysqld.inc b/mysql-test/include/kill_mysqld.inc new file mode 100644 index 00000000000..86ee048a0f1 --- /dev/null +++ b/mysql-test/include/kill_mysqld.inc @@ -0,0 +1,7 @@ +--let $_server_id= `SELECT @@server_id` +--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect + +--echo # Kill the server +--exec echo "wait" > $_expect_file_name +--shutdown_server 0 +--source include/wait_until_disconnected.inc diff --git a/mysql-test/include/sync_slave_sql_with_io.inc b/mysql-test/include/sync_slave_sql_with_io.inc index 8048f7a177c..9efede9a61f 100644 --- a/mysql-test/include/sync_slave_sql_with_io.inc +++ b/mysql-test/include/sync_slave_sql_with_io.inc @@ -26,6 +26,10 @@ let $_slave_timeout= $slave_timeout; if (!$_slave_timeout) { let $_slave_timeout= 300; + if ($VALGRIND_TEST) + { + let $_slave_timeout= 1500; + } } --let $_master_log_file= query_get_value(SHOW SLAVE STATUS, Master_Log_File, 1) diff --git a/mysql-test/include/wait_for_slave_param.inc b/mysql-test/include/wait_for_slave_param.inc index d3f7ec56614..25020d46ed9 100644 --- a/mysql-test/include/wait_for_slave_param.inc +++ b/mysql-test/include/wait_for_slave_param.inc @@ -50,6 +50,10 @@ let $_slave_timeout= $slave_timeout; if (!$_slave_timeout) { let $_slave_timeout= 300; + if ($VALGRIND_TEST) + { + let $_slave_timeout= 1500; + } } if ($slave_error_param == '') |