1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-8491 - On shutdown, report the user and the host executed that.

Browse Source 
Fixed main.shutdown failure on Windows.
This commit is contained in:
Sergey Vojtovich 2015-12-29 18:06:00 +04:00
parent 2ba7ed77aa
commit f8dd40eec6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/shutdown.result
View File

@ -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

2
mysql-test/t/shutdown.test
View File

@ -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