diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-07 13:37:11 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-07 13:37:11 +0300 |
| commit | c444c4f56f33c4a03b7bdebea642ae2b9878cf59 (patch) | |
| tree | cfc7680310d6f385a7a68a83610f51ff12d9f4e8 /sql/sql_parse.cc | |
| parent | f29d24b0f88b67504bc701b6f2773a0109ad6154 (diff) | |
| parent | e1e3293da56324c3efff25ed79d87ccf6c8fb2d8 (diff) | |
| download | mariadb-git-c444c4f56f33c4a03b7bdebea642ae2b9878cf59.tar.gz | |
merge and typo fix
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 80a41fae9b9..138f3b2cd93 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1353,8 +1353,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd, SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in packet[0]. */ - enum mysql_enum_shutdown_level level= - (enum mysql_enum_shutdown_level) (uchar) packet[0]; + enum mysql_enum_shutdown_level level; + if (!thd->is_valid_time()) + level= SHUTDOWN_DEFAULT; + else + level= (enum mysql_enum_shutdown_level) (uchar) packet[0]; if (level == SHUTDOWN_DEFAULT) level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable else if (level != SHUTDOWN_WAIT_ALL_BUFFERS) |