database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1.emb
This commit is contained in:
hf@deer.(none)
2004-08-19 15:47:09 +05:00
parent a7510c70fc 69ee037e29
commit c43d7d92dd
8 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql-common/client.c
View File

@ -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,