diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-12-15 15:57:26 +0100 |
| commit | 6bf10fac445d73fb796d4863612c87bff5f28b66 (patch) | |
| tree | 4d51e193684163c21e47e9de6536cd8dae0613eb /libmysql/libmysql.c | |
| parent | 8efaff4959efe32ff9bc47c1bf1710cfe9ab21b5 (diff) | |
| parent | 39a8d7965d912d8fb32436735449ce04e85583d1 (diff) | |
| download | mariadb-git-6bf10fac445d73fb796d4863612c87bff5f28b66.tar.gz | |
5.5 merge
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 4306b3b774d..6cc44c26aa3 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) |