Bug#22185872 : INCOMPATIBILITY IN LIBMYSQLCLIENT VERSION BETWEEN 5.7.9 AND 5.7.10

Description : 1. enum for new option --tsl_version was not
                 added at the end of the list.
              2. Symbol version for existing libmysqlclient
                 symbols were changed from 20.0 to 20.1.

Solution : 1. Moved MYSQL_OPT_TLS_VERSION to the end of
              the list.
           2. For MySQL 5.7, corrected symbol version
              of existing libmysqlclient symbols.

Reviewed-By: Georgi Kodinov <[email protected]>
Reviewed-By: Norvald Ryeng <[email protected]>
(cherry picked from commit 2b7f645832bf342ebf5d89f76cd0ef9f1627ddcf)

Author: harinvadodaria

client/client_priv.h

@@ -48,7 +48,6 @@ enum options_client
   OPT_SELECT_LIMIT, OPT_MAX_JOIN_SIZE, OPT_SSL_SSL,
   OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH,
   OPT_SSL_CIPHER, OPT_SHUTDOWN_TIMEOUT, OPT_LOCAL_INFILE,
-  OPT_TLS_VERSION,
   OPT_DELETE_MASTER_LOGS, OPT_COMPACT,
   OPT_PROMPT, OPT_IGN_LINES, OPT_TRANSACTION, OPT_MYSQL_PROTOCOL,
   OPT_SHARED_MEMORY_BASE_NAME, OPT_FRM, OPT_SKIP_OPTIMIZATION,
@@ -106,6 +105,8 @@ enum options_client
   OPT_SERVER_PUBLIC_KEY,
   OPT_ENABLE_CLEARTEXT_PLUGIN,
   OPT_CONNECTION_SERVER_ID,
+  OPT_TLS_VERSION,
+  /* Add new option above this */
   OPT_MAX_CLIENT_OPTION
 };
 

cmake/mysql_version.cmake

@@ -80,6 +80,9 @@ ENDMACRO()
 GET_MYSQL_VERSION()
 
 SET(SHARED_LIB_PATCH_VERSION ${PATCH_VERSION})
+
+# Beware : This is a hack to reset SHARED_LIB_PATCH_VERSION in accordance
+# with the change in value of SHARED_LIB_MINOR_VERSION.
 MATH(EXPR SHARED_LIB_PATCH_VERSION "${SHARED_LIB_PATCH_VERSION}-10")
 
 SET(MYSQL_TCP_PORT_DEFAULT "3306")

include/mysql.h

@@ -157,15 +157,15 @@ enum mysql_option
   MYSQL_OPT_BIND,
   MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT, 
   MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER,
-  MYSQL_OPT_TLS_VERSION,
   MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH,
   MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD,
   MYSQL_OPT_CONNECT_ATTR_DELETE,
   MYSQL_SERVER_PUBLIC_KEY,
   MYSQL_ENABLE_CLEARTEXT_PLUGIN,
   MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
   MYSQL_OPT_SSL_ENFORCE,
-  MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH
+  MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
+  MYSQL_OPT_TLS_VERSION
 };
 
 /**

include/mysql.h.pp

@@ -353,15 +353,15 @@
   MYSQL_OPT_BIND,
   MYSQL_OPT_SSL_KEY, MYSQL_OPT_SSL_CERT,
   MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CIPHER,
-  MYSQL_OPT_TLS_VERSION,
   MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH,
   MYSQL_OPT_CONNECT_ATTR_RESET, MYSQL_OPT_CONNECT_ATTR_ADD,
   MYSQL_OPT_CONNECT_ATTR_DELETE,
   MYSQL_SERVER_PUBLIC_KEY,
   MYSQL_ENABLE_CLEARTEXT_PLUGIN,
   MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS,
   MYSQL_OPT_SSL_ENFORCE,
-  MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH
+  MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH,
+  MYSQL_OPT_TLS_VERSION
 };
 struct st_mysql_options_extention;
 struct st_mysql_options {

libmysql/libmysql.ver.in

@@ -14,5 +14,5 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */
 
 
-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@.@SHARED_LIB_MINOR_VERSION@
+libmysqlclient_@SHARED_LIB_MAJOR_VERSION@.0
 { global: ${CLIENT_API_FUNCTIONS};${CLIENT_API_FUNCTIONS_UNDOCUMENTED}; local: *; };