diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 14:38:27 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-03 14:38:27 +0200 |
| commit | d54510716e3ed1c497eb45338dbc47dfd0c2d0b2 (patch) | |
| tree | 94a3351755f524f29f7931ba33fbc9438132a82f /mysql-test/include/start_mysqld.inc | |
| parent | fb41117c907a99d051ac09c229762978373d7eb0 (diff) | |
| parent | e51a1d6fc0c105d56c6f05efb3d9fd05b7e4f22f (diff) | |
| download | mariadb-git-10.4-MDEV-29988-merge.tar.gz | |
WIP merge 10.3 into 10.410.4-MDEV-29988-merge
Diffstat (limited to 'mysql-test/include/start_mysqld.inc')
| -rw-r--r-- | mysql-test/include/start_mysqld.inc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc index b4fe116fe86..6e448cb2efd 100644 --- a/mysql-test/include/start_mysqld.inc +++ b/mysql-test/include/start_mysqld.inc @@ -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" } } |