diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-03-26 12:33:49 +0200 |
| commit | d92009231d90cc187a89eab78bcf3ef090c5e24f (patch) | |
| tree | 31eff0c98bd6e65c4c2c7ce3e0ebc1d950a8969c /include | |
| parent | 485e7264a97683ca3b560d21dec6829fe284fc1d (diff) | |
| download | mariadb-git-d92009231d90cc187a89eab78bcf3ef090c5e24f.tar.gz | |
a couple of minor post-5.5-merge cleanups
include/mysql_com.h:
remove "shutdown levels" that aren't shutdown levels from mysql_enum_shutdown_level
mysys/my_addr_resolve.c:
my_snprintf in 5.5 (but not in 5.3) supports %p
sql/item_func.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/item_subselect.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/opt_subselect.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
sql/sql_select.cc:
use a method (that exists only in 5.5) instead of directly accessing a member
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h.pp | 4 | ||||
| -rw-r--r-- | include/mysql_com.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 002b3f2e2ea..ce577146581 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -66,9 +66,7 @@ enum mysql_enum_shutdown_level { SHUTDOWN_WAIT_TRANSACTIONS= (unsigned char)(1 << 1), SHUTDOWN_WAIT_UPDATES= (unsigned char)(1 << 3), SHUTDOWN_WAIT_ALL_BUFFERS= ((unsigned char)(1 << 3) << 1), - SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1, - SHUTDOWN_KILL_QUERY= 254, - SHUTDOWN_KILL_CONNECTION= 255 + SHUTDOWN_WAIT_CRITICAL_BUFFERS= ((unsigned char)(1 << 3) << 1) + 1 }; enum enum_cursor_type { diff --git a/include/mysql_com.h b/include/mysql_com.h index b35e8961bbb..0988d20f97f 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -435,10 +435,7 @@ enum mysql_enum_shutdown_level { /* flush InnoDB buffers and other storage engines' buffers*/ SHUTDOWN_WAIT_ALL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1), /* don't flush InnoDB buffers, flush other storage engines' buffers*/ - SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1, - /* Now the 2 levels of the KILL command */ - SHUTDOWN_KILL_QUERY= 254, - SHUTDOWN_KILL_CONNECTION= 255 + SHUTDOWN_WAIT_CRITICAL_BUFFERS= (MYSQL_SHUTDOWN_KILLABLE_UPDATE << 1) + 1 }; /* Compatibility */ |