diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:55:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:55:43 -0400 |
| commit | 3f53d3d57d302a86cc3e0306ec2a7677460fc13f (patch) | |
| tree | 9380c0082be39f0a22e1cc94957f16d75b66c7f6 /include/mysql_com.h | |
| parent | 37c33a0ff605e89a5336af0a9601e8b4f4eeb0a5 (diff) | |
| parent | 0c1ccbf014e9d58752a710067b0245b968ace45f (diff) | |
| download | mariadb-git-3f53d3d57d302a86cc3e0306ec2a7677460fc13f.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_mergable
into zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-maint
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql-common/client.c:
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 60e726396cb..3f2bf5d43a5 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -134,8 +134,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 */ |