MDEV-26713 fixup: Prefer shutdown to kill

A subsequently executed test could fail due to warning messages that some mysql.help_% tables were not closed properly.
MariaDB · Jun 7, 2022 · 0476f48 · 0476f48
1 parent 57d4a24
commit 0476f48
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/mysql-test/main/winservice.inc b/mysql-test/main/winservice.inc
@@ -18,7 +18,7 @@ error 0,$ERROR_SERVICE_DOES_NOT_EXIST;
 exec $sc_exe delete $service_name;
 --enable_result_log
 
-source include/kill_mysqld.inc;
+source include/shutdown_mysqld.inc;
 echo # run mysql_install_db with --service parameter;
 --disable_result_log
 exec $MYSQL_INSTALL_DB_EXE --datadir=$ddir --port=$MASTER_MYPORT --password=$password --service=$service_name -R;

diff --git a/mysql-test/main/winservice_basic.result b/mysql-test/main/winservice_basic.result
@@ -1,4 +1,3 @@
-# Kill the server
 # run mysql_install_db with --service parameter
 # Start service
 # Connect with root user password=password