database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-03 16:10:02 +02:00
parent fb41117c90 8760f6907c
commit fb0808c450
149 changed files with 2784 additions and 1991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mysql-test/include/start_mysqld.inc
View File

@ -12,25 +12,32 @@ if (!$restart_noprint)
--let $restart_noprint=0
}
--let $restart_cmd= restart
if ($restart_bindir)
{
--let $restart_cmd= restart_bindir $restart_bindir
}
if ($restart_parameters)
{
--exec echo "restart: $restart_parameters" > $_expect_file_name
--exec echo "$restart_cmd: $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"
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--exec echo "# $restart_cmd: $restart_parameters"
}
if ($restart_noprint == 1)
{
--exec echo "# restart: with restart_parameters"
--exec echo "# $restart_cmd: with restart_parameters"
}
}
if (!$restart_parameters)
{
--exec echo "restart" > $_expect_file_name
--exec echo "$restart_cmd" > $_expect_file_name
if ($restart_noprint < 2)
{
--exec echo "# restart"
--exec echo "# $restart_cmd"
}
}