diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-29 18:06:00 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2015-12-30 13:34:15 +0400 |
| commit | f8dd40eec6936aa407b0c89cbee4af2be8d019d2 (patch) | |
| tree | 9606ff6fb3a4bc20d7860931d4f1df89f3f5483d | |
| parent | 2ba7ed77aab05004f0c853a77850e325b78a1892 (diff) | |
| download | mariadb-git-f8dd40eec6936aa407b0c89cbee4af2be8d019d2.tar.gz | |
MDEV-8491 - On shutdown, report the user and the host executed that.
Fixed main.shutdown failure on Windows.
| -rw-r--r-- | mysql-test/r/shutdown.result | 2 | ||||
| -rw-r--r-- | 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 |