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 /sql-common | |
| 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 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 17cc8ed0a8f..68878df50e8 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -723,7 +723,7 @@ void set_mysql_error(MYSQL *mysql, int errcode, const char *sqlstate) Flush result set sent from server */ -void flush_use_result(MYSQL *mysql) +static void cli_flush_use_result(MYSQL *mysql) { /* Clear the current execution status */ DBUG_PRINT("warning",("Not all packets read, clearing them")); @@ -842,7 +842,7 @@ mysql_free_result(MYSQL_RES *result) mysql->unbuffered_fetch_owner= 0; if (mysql->status == MYSQL_STATUS_USE_RESULT) { - flush_use_result(mysql); + (*mysql->methods->flush_use_result)(mysql); mysql->status=MYSQL_STATUS_READY; } } @@ -1493,7 +1493,8 @@ static MYSQL_METHODS client_methods= cli_advanced_command, cli_read_rows, cli_use_result, - cli_fetch_lengths + cli_fetch_lengths, + cli_flush_use_result #ifndef MYSQL_SERVER ,cli_list_fields, cli_read_prepare_result, |