diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-08-28 20:41:22 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-08-28 20:41:22 -0400 |
| commit | 80bb699f92ef052b86ceb65f0ba2cc5c42e85c7b (patch) | |
| tree | 9323c1a51b2c0bf1c2b571c5097463914e9b8290 /include/mysql_com.h | |
| parent | 68ced7fb1af86376ade803b83d6fcb321aa2d4d7 (diff) | |
| parent | e88121ea7ab3f2e303a89531d725b2f9988355ac (diff) | |
| download | mariadb-git-80bb699f92ef052b86ceb65f0ba2cc5c42e85c7b.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21527
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql-common/client.c:
Auto merged
client/mysqldump.c:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/t/mysqldump.test:
manual merge
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 196930fcb3f..b7c58337fc3 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 */ |