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

5.3->5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-22 18:04:38 +01:00
parent af32b02c06 42221abaed
commit d2755a2c9c
394 changed files with 17631 additions and 3357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/mysql_com.h
View File

@@ -428,12 +428,15 @@ enum mysql_enum_shutdown_level {
/* don't flush InnoDB buffers, flush other storage engines' buffers*/
SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1,
/* Now the 2 levels of the KILL command */
#if MYSQL_VERSION_ID >= 50000
KILL_QUERY= 254,
#endif
KILL_CONNECTION= 255
SHUTDOWN_KILL_QUERY= 254,
SHUTDOWN_KILL_CONNECTION= 255
};
/* Compatibility */
#if !defined(MYSQL_SERVER) && defined(USE_OLD_FUNCTIONS)
#define KILL_QUERY SHUTDOWN_KILL_QUERY
#define KILL_CONNECTION SHUTDOWN_KILL_CONNECTION
#endif
enum enum_cursor_type
{