diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-01 11:23:08 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-01 11:23:08 +0200 |
| commit | 4991cc07e5ec7a982145fa74539977bcedb0af30 (patch) | |
| tree | f8c7e6cc8b0bf666906a0c4e12e7ac8ba06ba7cb /include/mysql_com.h | |
| parent | 22d76f5a5520f384985e7de1dc30b2c3cd4d0feb (diff) | |
| parent | 5d58edf00ffb3ebdb857dfe3d07e6aff0343b0ed (diff) | |
| download | mariadb-git-4991cc07e5ec7a982145fa74539977bcedb0af30.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_mgm.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/grant.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index cd75dbd6ab6..f1c48112467 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -138,8 +138,10 @@ enum enum_server_command #define CLIENT_TRANSACTIONS 8192 /* Client knows about transactions */ #define CLIENT_RESERVED 16384 /* Old flag for 4.1 protocol */ #define CLIENT_SECURE_CONNECTION 32768 /* New 4.1 authentication */ -#define CLIENT_MULTI_STATEMENTS 65536 /* Enable/disable multi-stmt support */ -#define CLIENT_MULTI_RESULTS 131072 /* Enable/disable multi-results */ +#define CLIENT_MULTI_STATEMENTS (((ulong) 1) << 16) /* Enable/disable multi-stmt support */ +#define CLIENT_MULTI_RESULTS (((ulong) 1) << 17) /* Enable/disable multi-results */ + +#define CLIENT_SSL_VERIFY_SERVER_CERT (((ulong) 1) << 30) #define CLIENT_REMEMBER_OPTIONS (((ulong) 1) << 31) #define SERVER_STATUS_IN_TRANS 1 /* Transaction has started */ |