Write information about restart in .result

Idea comes from MySQL which does something similar

Author: montywi

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
-

mysql-test/main/bootstrap.result

@@ -1,10 +1,13 @@
 drop table if exists t1;
 # Kill the server
+# restart
 drop table t1;
 # Kill the server
+# restart
 drop table t1;
 ERROR 42S02: Unknown table 'test.t1'
 # Kill the server
+# restart
 drop table t1;
 End of 5.1 tests
 #
@@ -15,8 +18,10 @@ SELECT 'bug' as '' FROM INFORMATION_SCHEMA.ENGINES WHERE engine='innodb'
  and SUPPORT='YES';
 
 # Kill the server
+# restart
 End of 5.5 tests
 # Kill the server
+# restart
 flush tables;
 show create table t1;
 Table	Create Table
@@ -29,3 +34,4 @@ name	dl
 EXAMPLE	ha_example.so
 truncate table mysql.plugin;
 # Kill the server
+# restart

mysql-test/main/events_restart.result

@@ -15,6 +15,7 @@ insert into event_like select * from mysql.event;
 alter table mysql.event
 change column body  body longtext character set utf8 collate utf8_bin;
 "Now we restart the server"
+# restart
 use events_test;
 select @@event_scheduler;
 @@event_scheduler
@@ -75,6 +76,7 @@ events_test	abc1	root@localhost	SYSTEM	RECURRING	#	1	SECOND	#	#	ENABLED	1	latin1
 events_test	abc2	root@localhost	SYSTEM	RECURRING	#	1	SECOND	#	#	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 events_test	abc3	root@localhost	SYSTEM	RECURRING	#	1	SECOND	#	#	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 Now let's restart the server again
+# restart
 use events_test;
 select @@event_scheduler;
 @@event_scheduler
@@ -95,6 +97,7 @@ SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 test	e1	root@localhost	SYSTEM	RECURRING	#	1	SECOND	#	#	DISABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci
 "Now we restart the server"
+# restart
 USE test;
 SELECT @@event_scheduler;
 @@event_scheduler

mysql-test/main/flush_ssl.result

@@ -1,4 +1,5 @@
 # Kill the server
+# restart: --ssl-key=MYSQLTEST_VARDIR/tmp/ssl_key.pem --ssl-cert=MYSQLTEST_VARDIR/tmp/ssl_cert.pem
 connect  ssl_con,localhost,root,,,,,SSL;
 SELECT VARIABLE_VALUE INTO @ssl_not_after FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_server_not_after';
 # Use a different certificate ("Not after" certificate field changed)
@@ -24,3 +25,4 @@ SSL_ACCEPTS	0
 SSL_FINISHED_ACCEPTS	0
 # Cleanup
 # Kill the server
+# restart

mysql-test/main/mysql_install_db_win.result

@@ -5,9 +5,11 @@ Setting root password
 Creating my.ini file
 Creation of the database was successful
 # Kill the server
+# restart: --datadir=MYSQLTEST_VARDIR/tmp/ddir --loose-innodb
 connect root,localhost,root,foo;
 SELECT @@datadir;
 @@datadir
 DATADIR/
 # Kill the server
 connection default;
+# restart

mysql-test/main/mysql_upgrade.result

@@ -581,6 +581,7 @@ GRANT USAGE ON *.* TO 'user3'@'%';
 GRANT ALL PRIVILEGES ON `roelt`.`test2` TO 'user3'@'%';
 alter table mysql.user drop column Delete_history_priv;
 alter table mysql.db drop column Delete_history_priv;
+# restart
 Run mysql_upgrade with all privileges on a user
 flush privileges;
 SHOW GRANTS FOR 'user3'@'%';

mysql-test/main/plugin_auth.result

@@ -292,6 +292,7 @@ DROP DATABASE shared;
 CALL mtr.add_suppression("Missing system table mysql.proxies_priv.");
 DROP TABLE mysql.proxies_priv;
 # Must come back with mysql.proxies_priv absent.
+# restart
 SELECT * FROM mysql.proxies_priv;
 ERROR 42S02: Table 'mysql.proxies_priv' doesn't exist
 CREATE USER u1@localhost;

mysql-test/main/plugin_innodb.result

@@ -3,6 +3,7 @@ create table t1(a int) engine=example;
 drop table t1;
 alter table mysql.plugin engine=innodb;
 restart
+# restart
 create table t1(a int) engine=example;
 select * from t1;
 a

mysql-test/main/ps_error.result

@@ -31,6 +31,7 @@ Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'foo'
 EXECUTE stmt;
 ERROR 22007: Truncated incorrect DOUBLE value: 'foo'
+# restart
 SELECT 'All done';
 All done
 All done

mysql-test/main/skip_grants.result

@@ -111,3 +111,4 @@ CREATE USER for baz@baz
 CREATE USER 'baz'@'baz' IDENTIFIED BY PASSWORD '*E52096EF8EB0240275A7FE9E069101C33F98CF07'
 drop user bar@foo;
 drop user baz@baz;
+# restart