diff options
author | unknown <guilhem@mysql.com> | 2004-06-21 23:04:50 +0200 |
---|---|---|
committer | unknown <guilhem@mysql.com> | 2004-06-21 23:04:50 +0200 |
commit | ce5b804e7b0d651fd38f691ee52fbb9ad9274e08 (patch) | |
tree | b9c10b6048c62e76ee7398803a7133b75b86ecab /VC++Files | |
parent | 6091a75f774ce8d3241c269db54a4f21784f0351 (diff) | |
download | mariadb-git-ce5b804e7b0d651fd38f691ee52fbb9ad9274e08.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).
VC++Files/winmysqladmin/mysql_com.h:
putting in place the 2 types of KILL of 5.0
include/mysql_com.h:
putting in place the two types of KILL of 5.0
Diffstat (limited to 'VC++Files')
-rw-r--r-- | VC++Files/winmysqladmin/mysql_com.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/VC++Files/winmysqladmin/mysql_com.h b/VC++Files/winmysqladmin/mysql_com.h index 36d97c5b9a7..0870f340451 100644 --- a/VC++Files/winmysqladmin/mysql_com.h +++ b/VC++Files/winmysqladmin/mysql_com.h @@ -174,7 +174,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 }; extern unsigned long max_allowed_packet; |