summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorguilhem@mysql.com <>2004-06-21 23:04:50 +0200
committerguilhem@mysql.com <>2004-06-21 23:04:50 +0200
commitc846e86d54a394dca19a70d86a906812a491cb19 (patch)
treeb9c10b6048c62e76ee7398803a7133b75b86ecab /include
parentff678fd8b76d9022eee3ee5e7004d3dea31bf374 (diff)
downloadmariadb-git-c846e86d54a394dca19a70d86a906812a491cb19.tar.gz
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).
Diffstat (limited to 'include')
-rw-r--r--include/mysql_com.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h
index d7d0133a093..47231ef31c6 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.h
@@ -242,7 +242,11 @@ enum enum_shutdown_level {
SHUTDOWN_WAIT_STATEMENTS= 30, /* wait for existing updating stmts to finish */
SHUTDOWN_WAIT_ALL_BUFFERS= 40, /* flush InnoDB buffers */
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 */