diff options
| author | unknown <hf@deer.(none)> | 2004-08-19 21:25:37 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-19 21:25:37 +0500 |
| commit | 1d3a929ec97b791394060e84f809f1dd8cd28f26 (patch) | |
| tree | a29d4788be6add247ba0c211cfbbe6fd6f874684 /include | |
| parent | 37c025e6f9e862725a819076a4967dfc4913974d (diff) | |
| parent | e3c56fd4d7f85b16adb7c929061fefee6895ba55 (diff) | |
| download | mariadb-git-1d3a929ec97b791394060e84f809f1dd8cd28f26.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql_com.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index fa25db5f11a..36d41b2964a 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -227,28 +227,28 @@ enum enum_field_types { MYSQL_TYPE_DECIMAL, MYSQL_TYPE_TINY, /* Shutdown/kill enums and constants */ /* Bits for THD::killable. */ -#define KILLABLE_CONNECT (unsigned char)(1 << 0) -#define KILLABLE_TRANS (unsigned char)(1 << 1) -#define KILLABLE_LOCK_TABLE (unsigned char)(1 << 2) -#define KILLABLE_UPDATE (unsigned char)(1 << 3) +#define MYSQL_SHUTDOWN_KILLABLE_CONNECT (unsigned char)(1 << 0) +#define MYSQL_SHUTDOWN_KILLABLE_TRANS (unsigned char)(1 << 1) +#define MYSQL_SHUTDOWN_KILLABLE_LOCK_TABLE (unsigned char)(1 << 2) +#define MYSQL_SHUTDOWN_KILLABLE_UPDATE (unsigned char)(1 << 3) -enum enum_shutdown_level { +enum mysql_enum_shutdown_level { /* We want levels to be in growing order of hardness (because we use number comparisons). Note that DEFAULT does not respect the growing property, but it's ok. */ - SHUTDOWN_DEFAULT= 0, + DEFAULT= 0, /* wait for existing connections to finish */ - SHUTDOWN_WAIT_CONNECTIONS= KILLABLE_CONNECT, + WAIT_CONNECTIONS= MYSQL_SHUTDOWN_KILLABLE_CONNECT, /* wait for existing trans to finish */ - SHUTDOWN_WAIT_TRANSACTIONS= KILLABLE_TRANS, + WAIT_TRANSACTIONS= MYSQL_SHUTDOWN_KILLABLE_TRANS, /* wait for existing updates to finish (=> no partial MyISAM update) */ - SHUTDOWN_WAIT_UPDATES= KILLABLE_UPDATE, + WAIT_UPDATES= MYSQL_SHUTDOWN_KILLABLE_UPDATE, /* flush InnoDB buffers and other storage engines' buffers*/ - SHUTDOWN_WAIT_ALL_BUFFERS= (KILLABLE_UPDATE << 1), + WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), /* don't flush InnoDB buffers, flush other storage engines' buffers*/ - SHUTDOWN_WAIT_CRITICAL_BUFFERS= (KILLABLE_UPDATE << 1) + 1, + 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, @@ -256,10 +256,6 @@ enum enum_shutdown_level { KILL_CONNECTION= 255 }; -/* Same value and type (0, enum_shutdown_level) but not same meaning */ -#define NOT_KILLED SHUTDOWN_DEFAULT - - /* options for mysql_set_option */ enum enum_mysql_set_option { |