diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-12-08 16:39:58 -0700 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-12-08 16:39:58 -0700 |
| commit | 844c23e21186f5ff251c578ec2f7a5e3e9a80782 (patch) | |
| tree | 5919c4a805cda52150a6da6814c72101f8c5eaef /include/mysql_h.ic | |
| parent | f4449865ebcb5e8000f7076f5ef1b67435e31231 (diff) | |
| parent | 8749ded715fb9d93faa8b7068703b9674f329108 (diff) | |
| download | mariadb-git-844c23e21186f5ff251c578ec2f7a5e3e9a80782.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
include/mysql.h:
Auto merged
include/mysql_h.ic:
Auto merged
mysql-test/r/func_in.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
Makefile.am:
Manual merge
Diffstat (limited to 'include/mysql_h.ic')
| -rw-r--r-- | include/mysql_h.ic | 1 |
1 files changed, 1 insertions, 0 deletions
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" |