diff options
| author | tsmith/tim@siva.hindu.god <> | 2006-12-08 16:39:58 -0700 |
|---|---|---|
| committer | tsmith/tim@siva.hindu.god <> | 2006-12-08 16:39:58 -0700 |
| commit | 50e372d60864dbed25aac827e93d159ff5d780c6 (patch) | |
| tree | 5919c4a805cda52150a6da6814c72101f8c5eaef /include | |
| parent | d9dc018226c4cf01b0a8436b11f0d2bc227ded24 (diff) | |
| parent | d54c696c24b28975d85893d51270bd33e64a0e83 (diff) | |
| download | mariadb-git-50e372d60864dbed25aac827e93d159ff5d780c6.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
into siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 2 | ||||
| -rw-r--r-- | include/mysql_h.ic | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index f2a82c99fc3..99d6fc27407 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -65,9 +65,9 @@ typedef int my_socket; #endif /* my_socket_defined */ #endif /* _global_h */ +#include "mysql_version.h" #include "mysql_com.h" #include "mysql_time.h" -#include "mysql_version.h" #include "typelib.h" #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */ diff --git a/include/mysql_h.ic b/include/mysql_h.ic index 51cbb1fb7eb..f802d4bb31d 100644 --- a/include/mysql_h.ic +++ b/include/mysql_h.ic @@ -576,6 +576,7 @@ enum mysql_enum_shutdown_level 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), + KILL_QUERY = 254, KILL_CONNECTION = 255, }; # 154 "mysql.h" |