Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
8bc712e4
Commit
8bc712e4
authored
Jan 19, 2015
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-6671 mysql_server_end breaks OpenSSL
parent
3212aaa9
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
1 deletion
+7
-1
include/mysql.h
include/mysql.h
+1
-0
include/mysql.h.pp
include/mysql.h.pp
+1
-0
libmysql/CMakeLists.txt
libmysql/CMakeLists.txt
+2
-0
libmysql/libmysql.c
libmysql/libmysql.c
+2
-1
sql-common/client.c
sql-common/client.c
+1
-0
No files found.
include/mysql.h
View file @
8bc712e4
...
...
@@ -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
;
...
...
include/mysql.h.pp
View file @
8bc712e4
...
...
@@ -168,6 +168,7 @@ extern LIST *list_reverse(LIST *root);
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
{
...
...
libmysql/CMakeLists.txt
View file @
8bc712e4
...
...
@@ -236,6 +236,8 @@ dynamic_column_exists
dynamic_column_list
dynamic_column_get
dynamic_column_prepare_decimal
#
mariadb_deinitialize_ssl
)
SET
(
CLIENT_API_FUNCTIONS
...
...
libmysql/libmysql.c
View file @
8bc712e4
...
...
@@ -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
...
...
sql-common/client.c
View file @
8bc712e4
...
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment