diff options
| author | unknown <hf@deer.(none)> | 2003-09-29 14:09:51 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-09-29 14:09:51 +0500 |
| commit | 15779a96d719e42aaf3c56a65ead971ec08465fc (patch) | |
| tree | e6a406a016c1af6cb1f6d39ec322de1723cf85f1 /sql-common | |
| parent | 9a942c854fb232341037b7bc12e4e084be1b4692 (diff) | |
| download | mariadb-git-15779a96d719e42aaf3c56a65ead971ec08465fc.tar.gz | |
SCRUM
embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd
include/mysql.h:
free_embedded_thd added to the list of virtual methods
libmysqld/embedded_priv.h:
function deleted
libmysqld/lib_sql.cc:
function moved upper in file
sql-common/client.c:
call of free_embedded_thd added
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
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)); } |