diff options
| author | Michael Widenius <monty@mariadb.org> | 2019-03-25 08:02:22 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-04-01 19:47:24 +0300 |
| commit | b5615eff0d00cfb4c60b9d1bf67094da7c2258a6 (patch) | |
| tree | b4ebb1f0dc98463b98eb5cfb9fc633597f37c8f2 /mysql-test/include/start_mysqld.inc | |
| parent | 6fd7a4b60124bb7bcca2d90211e5113d37458875 (diff) | |
| download | mariadb-git-b5615eff0d00cfb4c60b9d1bf67094da7c2258a6.tar.gz | |
Write information about restart in .result
Idea comes from MySQL which does something similar
Diffstat (limited to 'mysql-test/include/start_mysqld.inc')
| -rw-r--r-- | mysql-test/include/start_mysqld.inc | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc index e31f26aad8c..b4fe116fe86 100644 --- a/mysql-test/include/start_mysqld.inc +++ b/mysql-test/include/start_mysqld.inc @@ -1,13 +1,37 @@ # Include this script only after using shutdown_mysqld.inc # where $_expect_file_name was initialized. # Write file to make mysql-test-run.pl start up the server again + +# restart_noprint defines how much is printed to the .result file +# if 0 (default) then '# result' and restart_parameters are printed +# if 1 then print #result but not the content of restart_parameters +# if 2 then nothing is printed + +if (!$restart_noprint) +{ + --let $restart_noprint=0 +} + if ($restart_parameters) { --exec echo "restart: $restart_parameters" > $_expect_file_name + if (!$restart_noprint) + { + --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + --exec echo "# restart: $restart_parameters" + } + if ($restart_noprint == 1) + { + --exec echo "# restart: with restart_parameters" + } } if (!$restart_parameters) { --exec echo "restart" > $_expect_file_name + if ($restart_noprint < 2) + { + --exec echo "# restart" + } } # Turn on reconnect @@ -18,4 +42,3 @@ if (!$restart_parameters) # Turn off reconnect again --disable_reconnect - |