[Commits] cf7e514: MDEV-8491 - On shutdown, report the user and the host executed that.

Sergey Vojtovich svoj at mariadb.org
Tue Dec 29 16:07:04 EET 2015


revision-id: cf7e5147794752cbde42ae78817145f4642be32e (mariadb-10.1.8-104-gcf7e514)
parent(s): ea578c9d6fcf8f65f247ccde90d692ac17b04e03
committer: Sergey Vojtovich
timestamp: 2015-12-29 18:06:00 +0400
message:

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 553dab6..748d8ec 100644
--- a/mysql-test/r/shutdown.result
+++ b/mysql-test/r/shutdown.result
@@ -8,4 +8,4 @@ drop user user1 at 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 d764e80..7080f9a 100644
--- a/mysql-test/t/shutdown.test
+++ b/mysql-test/t/shutdown.test
@@ -35,5 +35,5 @@ drop user user1 at 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


More information about the commits mailing list