From f8dd40eec6936aa407b0c89cbee4af2be8d019d2 Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Tue, 29 Dec 2015 18:06:00 +0400 Subject: [PATCH] MDEV-8491 - On shutdown, report the user and the host executed that. Fixed main.shutdown failure on Windows. --- mysql-test/r/shutdown.result | 2 +- mysql-test/t/shutdown.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/shutdown.result b/mysql-test/r/shutdown.result index 553dab6de29..748d8ec16a6 100644 --- a/mysql-test/r/shutdown.result +++ b/mysql-test/r/shutdown.result @@ -8,4 +8,4 @@ drop user user1@localhost; # # MDEV-8491 - On shutdown, report the user and the host executed that. # -FOUND /mysqld \(root\[root\] @ localhost \[\]\): Normal shutdown/ in mysqld.1.err +FOUND /mysqld(\.exe)? \(root\[root\] @ localhost \[(::1)?\]\): Normal shutdown/ in mysqld.1.err diff --git a/mysql-test/t/shutdown.test b/mysql-test/t/shutdown.test index d764e80cb72..7080f9a1a71 100644 --- a/mysql-test/t/shutdown.test +++ b/mysql-test/t/shutdown.test @@ -35,5 +35,5 @@ drop user user1@localhost; --echo # --let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err --let SEARCH_RANGE= -50000 ---let SEARCH_PATTERN=mysqld \(root\[root\] @ localhost \[\]\): Normal shutdown +--let SEARCH_PATTERN=mysqld(\.exe)? \(root\[root\] @ localhost \[(::1)?\]\): Normal shutdown --source include/search_pattern_in_file.inc