summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-12-16 13:02:21 +0100
committerSergei Golubchik <sergii@pisem.net>2013-12-16 13:02:21 +0100
commitd28d3ba40dc8ebef87199a2567ec96e9c5d744e2 (patch)
treec6b9ab1d8193fa2a26c5e376d43e536abd3a47ce /libmysql
parentff485d2dc4d5adaf5eef0ccd03ce62adf3bd30b3 (diff)
parent6bf10fac445d73fb796d4863612c87bff5f28b66 (diff)
downloadmariadb-git-d28d3ba40dc8ebef87199a2567ec96e9c5d744e2.tar.gz
10.0-base merge
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 45c141649e1..78de4b8867f 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -204,11 +204,11 @@ void STDCALL mysql_server_end()
mysql_client_plugin_deinit();
+ finish_client_errs();
+ vio_end();
#ifdef EMBEDDED_LIBRARY
end_embedded_server();
#endif
- finish_client_errs();
- vio_end();
/* If library called my_init(), free memory allocated by it */
if (!org_my_init_done)