diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-03-13 14:42:15 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-03-13 15:53:19 +0400 |
| commit | 649b7a64efba4620d79cd5a20560b11ffd4ae2a5 (patch) | |
| tree | 7fd0b58bae26374fc7084cdccf412f56a77f83e7 | |
| parent | 30019a48bfc908d8842b4cd03aad4c80dc5c7134 (diff) | |
| download | mariadb-git-649b7a64efba4620d79cd5a20560b11ffd4ae2a5.tar.gz | |
MDEV-9592 - New 'Normal shutdown' log format can be confusing
Elaborate shutdown message.
| -rw-r--r-- | mysql-test/r/shutdown.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/shutdown.test | 2 | ||||
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
3 files changed, 4 insertions, 4 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 diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index ade9d53cdb7..4285f5cffa5 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -1807,7 +1807,7 @@ ER_NORMAL_SHUTDOWN cze "%s (%s): normální ukončení" dan "%s (%s): Normal nedlukning" nla "%s (%s): Normaal afgesloten " - eng "%s (%s): Normal shutdown" + eng "%s (initiated by: %s): Normal shutdown" est "%s (%s): MariaDB lõpetas" fre "%s (%s): Arrêt normal du serveur" ger "%s (%s): Normal heruntergefahren" @@ -1822,7 +1822,7 @@ ER_NORMAL_SHUTDOWN pol "%s (%s): Standardowe zakończenie działania" por "%s (%s): 'Shutdown' normal" rum "%s (%s): Terminare normala" - rus "%s (%s): Корректная остановка" + rus "%s (инициирована пользователем: %s): Корректная остановка" serbian "%s (%s): Normalno gašenje" slo "%s (%s): normálne ukončenie" spa "%s (%s): Apagado normal" |