MDEV-6671 mysql_server_end breaks OpenSSL

MariaDB · Jan 19, 2015 · 8bc712e · 8bc712e
1 parent 3212aaa
commit 8bc712e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/include/mysql.h b/include/mysql.h
@@ -75,6 +75,7 @@ typedef int my_socket;
 
 #include "my_list.h" /* for LISTs used in 'MYSQL' and 'MYSQL_STMT' */
 
+extern unsigned int mariadb_deinitialize_ssl;
 extern unsigned int mysql_port;
 extern char *mysql_unix_port;
 

diff --git a/include/mysql.h.pp b/include/mysql.h.pp
@@ -168,6 +168,7 @@
 extern void list_free(LIST *root,unsigned int free_data);
 extern unsigned int list_length(LIST *);
 extern int list_walk(LIST *,list_walk_action action,unsigned char * argument);
+extern unsigned int mariadb_deinitialize_ssl;
 extern unsigned int mysql_port;
 extern char *mysql_unix_port;
 typedef struct st_mysql_field {

diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
@@ -236,6 +236,8 @@ dynamic_column_exists
 dynamic_column_list
 dynamic_column_get
 dynamic_column_prepare_decimal
+#
+mariadb_deinitialize_ssl
 )
 
 SET(CLIENT_API_FUNCTIONS

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
@@ -205,7 +205,8 @@ void STDCALL mysql_server_end()
   mysql_client_plugin_deinit();
 
   finish_client_errs();
-  vio_end();
+  if (mariadb_deinitialize_ssl)
+    vio_end();
 #ifdef EMBEDDED_LIBRARY
   end_embedded_server();
 #endif

diff --git a/sql-common/client.c b/sql-common/client.c
@@ -118,6 +118,7 @@ my_bool	net_flush(NET *net);
 #define native_password_plugin_name "mysql_native_password"
 #define old_password_plugin_name    "mysql_old_password"
 
+uint            mariadb_deinitialize_ssl= 1;
 uint		mysql_port=0;
 char		*mysql_unix_port= 0;
 const char	*unknown_sqlstate= "HY000";