From ce5b804e7b0d651fd38f691ee52fbb9ad9274e08 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 21 Jun 2004 23:04:50 +0200 Subject: [PATCH] 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 --- VC++Files/winmysqladmin/mysql_com.h | 6 +++++- include/mysql_com.h | 6 +++++- 2 files changed, 10 insertions(+), 2 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; 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 */