Commit c846e86d authored by guilhem@mysql.com's avatar guilhem@mysql.com

Including in enum_shutdown_level the 2 types of KILL of 5.0

(enum_shutdown_level is going to replace enum killed_state in 5.0).
parent ff678fd8
...@@ -174,7 +174,11 @@ enum enum_shutdown_level { ...@@ -174,7 +174,11 @@ enum enum_shutdown_level {
SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */ SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */
SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */ SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */
SHUTDOWN_ENUM_END= 255 /* must be last */ /* Now the 2 levels of the KILL command */
#if MYSQL_VERSION_ID >= 50000
KILL_QUERY= 254,
#endif
KILL_CONNECTION= 255
}; };
extern unsigned long max_allowed_packet; extern unsigned long max_allowed_packet;
......
...@@ -242,7 +242,11 @@ enum enum_shutdown_level { ...@@ -242,7 +242,11 @@ enum enum_shutdown_level {
SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */ SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */
SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */ SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */ SHUTDOWN_WAIT_CRITICAL_BUFFERS= 50, /* flush MyISAM buffs (no corruption) */
SHUTDOWN_ENUM_END= 255 /* must be last */ /* Now the 2 levels of the KILL command */
#if MYSQL_VERSION_ID >= 50000
KILL_QUERY= 254,
#endif
KILL_CONNECTION= 255
}; };
/* options for mysql_set_option */ /* options for mysql_set_option */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment