summaryrefslogtreecommitdiff
path: root/sql-common/client.c
diff options
context:
space:
mode:
authorhf@deer.(none) <>2003-09-29 14:09:51 +0500
committerhf@deer.(none) <>2003-09-29 14:09:51 +0500
commitcca80f8b5845e575e338e8f6e7b84d2574ffa058 (patch)
treee6a406a016c1af6cb1f6d39ec322de1723cf85f1 /sql-common/client.c
parent3f0096f9bb984cbe90718c61e30424906a6ade27 (diff)
downloadmariadb-git-cca80f8b5845e575e338e8f6e7b84d2574ffa058.tar.gz
SCRUM
embedded library some fixes - cleanup procedure changed for embedded library - deletion of embedded mysql->thd
Diffstat (limited to 'sql-common/client.c')
-rw-r--r--sql-common/client.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 6b3a44cf7d5..77aa733fe0c 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -1409,7 +1409,8 @@ static MYSQL_METHODS client_methods=
cli_read_prepare_result,
cli_stmt_execute,
cli_read_binary_rows,
- cli_unbuffered_fetch
+ cli_unbuffered_fetch,
+ NULL
#endif
};
@@ -2207,6 +2208,10 @@ void STDCALL mysql_close(MYSQL *mysql)
#endif
if (mysql != mysql->master)
mysql_close(mysql->master);
+#ifndef MYSQL_SERVER
+ if (mysql->thd)
+ (*mysql->methods->free_embedded_thd)(mysql);
+#endif
if (mysql->free_me)
my_free((gptr) mysql,MYF(0));
}