diff options
author | unknown <hf@deer.(none)> | 2004-07-22 20:54:25 +0500 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2004-07-22 20:54:25 +0500 |
commit | 2cd7e4cdefec2bd529a5de78e0d8c8adb636b036 (patch) | |
tree | ecfe787be62082cf510021730f7750916b699945 /libmysql/libmysql.c | |
parent | be922a58e91ec1df465ec2451787549d6aadbbcf (diff) | |
download | mariadb-git-2cd7e4cdefec2bd529a5de78e0d8c8adb636b036.tar.gz |
Fixes for bugs in embedded library:
#4700 (Unsigned value returned as signed)
just no appropriate checking
#4701 (Errors returned earlier than expected)
all errors returned from send_command()
#4702 (Result isn't freed properly if there's no retrieval)
flush_use_result has only 'client' version and should
be made 'virtual'
include/mysql.h:
flush_use_result 'virtual' method added to MYSQL (#4701)
include/sql_common.h:
no flush_use_result() now (#4702)
libmysql/libmysql.c:
call of the flush_use_result changed (#4702)
libmysqld/lib_sql.cc:
now errors returned from emb_advanced_command() or from emb_read_rows()
depending on if number of returned fields is not 0 (#4701)
emb_flush_use_result() implementation (#4702)
sql-common/client.c:
cli_flush_use_result() implementation (#4702)
sql/sql_prepare.cc:
unsigned flag now checked (#4700)
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 fc7728c98e0..2b67d645d1a 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4181,7 +4181,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; } } @@ -4231,7 +4231,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; |