MDEV-25004 restart_bindir option to restart server from different location

Adds new parameter $restart_bindir for restart_mysqld.inc.

Example:

let $restart_bindir= /home/midenok/src/mariadb/10.3b/build;
--source include/restart_mysqld.inc

It is good to return back original server before check_mysqld will be
run at the test end:

let $restart_bindir=;
--source include/restart_mysqld.inc

1 files changed, 33 insertions, 3 deletions

diff --git a/mysql-test/include/start_mysqld.inc b/mysql-test/include/start_mysqld.inc
index e31f26aad8c..14a0b088fc0 100644
--- a/mysql-test/include/start_mysqld.inc
+++ b/mysql-test/include/start_mysqld.inc
@@ -1,13 +1,44 @@
 # 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= 2
+}
+
+--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_cmd: $restart_parameters"
+  }
+  if ($restart_noprint == 1)
+  {
+    --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_cmd"
+  }
 }
 
 # Turn on reconnect
@@ -18,4 +49,3 @@ if (!$restart_parameters)
 
 # Turn off reconnect again
 --disable_reconnect
-