diff options
| author | Ramil Kalimullin <ramil.kalimullin@oracle.com> | 2017-03-13 17:01:59 +0400 |
|---|---|---|
| committer | Gipson Pulla <gipson.pulla@oracle.com> | 2017-03-14 16:02:09 +0530 |
| commit | 87e37ee06b32dda19f8c17a888586dd03191eeec (patch) | |
| tree | a27b2c788c65e0ac631b89dbf5232e536493a7b7 | |
| parent | 060b1eadf4913f7066484ea34ec62feead1bca44 (diff) | |
| download | mariadb-git-87e37ee06b32dda19f8c17a888586dd03191eeec.tar.gz | |
BUG#25575605: SETTING --SSL-MODE=REQUIRED SENDS CREDENTIALS BEFORE VERIFYING SSL CONNECTION
Changed MYSQL_OPT_SSL_MODE to be the same as in 5.6 (ABI compatibility).
(cherry picked from commit 47bb4eb5df1629b5d5e30aebfa9d7a6d74388a5d)
| -rw-r--r-- | include/mysql.h | 4 | ||||
| -rw-r--r-- | include/mysql.h.pp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/mysql.h b/include/mysql.h index 7ebf2f725a2..3a27ab4128c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -167,7 +167,9 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_ENABLE_CLEARTEXT_PLUGIN, MYSQL_OPT_SSL_MODE + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + /* Set MYSQL_OPT_SSL_MODE to be the same as in 5.6 (ABI compatibility). */ + MYSQL_OPT_SSL_MODE= 38 }; /** diff --git a/include/mysql.h.pp b/include/mysql.h.pp index 0f292d921ee..774bf2d0301 100644 --- a/include/mysql.h.pp +++ b/include/mysql.h.pp @@ -263,7 +263,8 @@ enum mysql_option MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, MYSQL_PLUGIN_DIR, MYSQL_DEFAULT_AUTH, - MYSQL_ENABLE_CLEARTEXT_PLUGIN, MYSQL_OPT_SSL_MODE + MYSQL_ENABLE_CLEARTEXT_PLUGIN, + MYSQL_OPT_SSL_MODE= 38 }; struct st_mysql_options_extention; struct st_mysql_options { |