diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-23 16:07:07 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-10-23 16:07:07 +0500 |
| commit | 7052246f8bc3b542272849c82dcfe8acd03c16cf (patch) | |
| tree | 14b1bce1b2cc1a4ea8a359b57a446b3a6387ff50 /sql/mysqld.cc | |
| parent | 795102b786910f6b5eaeb16fc75a9c02867fb07b (diff) | |
| parent | c2552ec37f2fe946042808a8018c2102855be13a (diff) | |
| download | mariadb-git-7052246f8bc3b542272849c82dcfe8acd03c16cf.tar.gz | |
automerge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 8176f71f726..3c689c48ea7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1001,7 +1001,7 @@ static void close_connections(void) if (tmp->vio_ok()) { if (global_system_variables.log_warnings) - sql_print_warning(ER(ER_FORCING_CLOSE),my_progname, + sql_print_warning(ER_DEFAULT(ER_FORCING_CLOSE),my_progname, tmp->thread_id, (tmp->main_security_ctx.user ? tmp->main_security_ctx.user : "")); |