diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:54:33 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-25 11:54:33 -0400 |
| commit | 0c1ccbf014e9d58752a710067b0245b968ace45f (patch) | |
| tree | 15f553bfc1ea8f261a75f1af5aaadd93bfced0e9 /include | |
| parent | 7dbd43b1a40664d3babdd0afba598fc857ee5984 (diff) | |
| download | mariadb-git-0c1ccbf014e9d58752a710067b0245b968ace45f.tar.gz | |
Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \
InterfaceError on connect
Removed the bool flag from the st_mysql_options struct, since it adds
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.
Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.
include/mysql.h:
Do not change the struct size.
include/mysql_com.h:
Add a new bit-flag for client verifying server SSL certificate.
Emphasize that we're not stepping on anyone else's bit/toes.
sql-common/client.c:
Set and read the bit-field for client-side SSL-cert checking of the server.
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 3a71e47f414..b2efa2ffd3b 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 ec1c133799f..d60cfd8d8d8 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 */ |