diff options
| author | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-08-19 15:47:09 +0500 |
| commit | 37c025e6f9e862725a819076a4967dfc4913974d (patch) | |
| tree | 1bb5b160e9bb81115b19732348ba96c4bf069602 /libmysql | |
| parent | cba27e4a91d18439f421b3a33d27df8a2bfa04c1 (diff) | |
| parent | de40ed916e4d4a70cee06250682e8a2c52d527a8 (diff) | |
| download | mariadb-git-37c025e6f9e862725a819076a4967dfc4913974d.tar.gz | |
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -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 fbadfc2c76e..2a4530cab48 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4392,7 +4392,7 @@ my_bool STDCALL mysql_stmt_free_result(MYSQL_STMT *stmt) if (mysql->status != MYSQL_STATUS_READY) { /* There is a result set and it belongs to this statement */ - flush_use_result(mysql); + (*mysql->methods->flush_use_result)(mysql); mysql->status= MYSQL_STATUS_READY; } } @@ -4442,7 +4442,7 @@ my_bool STDCALL mysql_stmt_close(MYSQL_STMT *stmt) Flush result set of the connection. If it does not belong to this statement, set a warning. */ - flush_use_result(mysql); + (*mysql->methods->flush_use_result)(mysql); if (mysql->unbuffered_fetch_owner) *mysql->unbuffered_fetch_owner= TRUE; mysql->status= MYSQL_STATUS_READY; |