summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-03-13 14:42:15 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-03-13 15:53:19 +0400
commit649b7a64efba4620d79cd5a20560b11ffd4ae2a5 (patch)
tree7fd0b58bae26374fc7084cdccf412f56a77f83e7 /mysql-test
parent30019a48bfc908d8842b4cd03aad4c80dc5c7134 (diff)
downloadmariadb-git-649b7a64efba4620d79cd5a20560b11ffd4ae2a5.tar.gz
MDEV-9592 - New 'Normal shutdown' log format can be confusing
Elaborate shutdown message.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/shutdown.result2
-rw-r--r--mysql-test/t/shutdown.test2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/shutdown.result b/mysql-test/r/shutdown.result
index be2eb16470c..7a69f58ffd9 100644
--- a/mysql-test/r/shutdown.result
+++ b/mysql-test/r/shutdown.result
@@ -13,4 +13,4 @@ drop user user1@localhost;
#
# MDEV-8491 - On shutdown, report the user and the host executed that.
#
-FOUND 2 /mysqld(\.exe)? \(root\[root\] @ localhost \[(::1)?\]\): Normal shutdown/ in mysqld.1.err
+FOUND 2 /mysqld(\.exe)? \(initiated by: 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 775628e441d..e423725177b 100644
--- a/mysql-test/t/shutdown.test
+++ b/mysql-test/t/shutdown.test
@@ -34,5 +34,5 @@ drop user user1@localhost;
--echo # MDEV-8491 - On shutdown, report the user and the host executed that.
--echo #
--let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_PATTERN=mysqld(\.exe)? \(root\[root\] @ localhost \[(::1)?\]\): Normal shutdown
+--let SEARCH_PATTERN=mysqld(\.exe)? \(initiated by: root\[root\] @ localhost \[(::1)?\]\): Normal shutdown
--source include/search_pattern_in_file.inc