diff --git a/mysql-test/main/winservice.inc b/mysql-test/main/winservice.inc index 42aab645cc8..2d8f6ccae1e 100644 --- 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 index a4de0080207..0a5e8693b6b 100644 --- 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