diff options
| author | cmiller@zippy.cornsilk.net <> | 2006-08-25 11:55:43 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2006-08-25 11:55:43 -0400 |
| commit | 5ea2a01feedc874fc01e9f1f0fe2a7e88a6f600b (patch) | |
| tree | 9380c0082be39f0a22e1cc94957f16d75b66c7f6 /include | |
| parent | e4bfce30589e734607f7e81f58ffab659c682d9f (diff) | |
| parent | 89d759b93e3975e5d5e1c5cf9b901c01b9e80ff7 (diff) | |
| download | mariadb-git-5ea2a01feedc874fc01e9f1f0fe2a7e88a6f600b.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
Diffstat (limited to 'include')
| -rw-r--r-- | include/mysql.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/mysql.h b/include/mysql.h index 72e5c457d5a..ae4a8222c5b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -165,7 +165,6 @@ struct st_mysql_options { char *ssl_ca; /* PEM CA file */ char *ssl_capath; /* PEM directory of CA-s? */ char *ssl_cipher; /* cipher to use */ - my_bool ssl_verify_server_cert; /* if to verify server cert */ char *shared_memory_base_name; unsigned long max_allowed_packet; my_bool use_ssl; /* if to use SSL or not */ 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 */ |