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)

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)
87e37ee0 · Ramil Kalimullin · Gipson Pulla · 060b1ead · 87e37ee0 · 87e37ee0
Commit 87e37ee0 authored Mar 13, 2017 by Ramil Kalimullin Committed by Gipson Pulla Mar 14, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

include/mysql.h include/mysql.h +3 -1

include/mysql.h.pp include/mysql.h.pp +2 -1

No files found.
--- 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
 };

 /**

--- 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 {