database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2

Browse Source
This commit is contained in:
Monty
2016-04-28 16:59:33 +03:00
parent fabeab7819 d5822a3ad0
commit 9c846373f0
61 changed files with 1007 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_parse.cc
View File

@@ -5308,6 +5308,7 @@ end_with_restore_list:
}
case SQLCOM_SHUTDOWN:
#ifndef EMBEDDED_LIBRARY
DBUG_EXECUTE_IF("crash_shutdown", DBUG_SUICIDE(););
if (check_global_access(thd,SHUTDOWN_ACL))
goto error;
kill_mysql(thd);