diff options
| author | unknown <dlenev@mysql.com> | 2004-02-11 16:09:33 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-02-11 16:09:33 +0300 |
| commit | f2753fe9ac04edac1e8b968d29e77178b4e8c0a5 (patch) | |
| tree | b39770a4e495210df1677fb31535c2ad2d14eb0d /libmysql/libmysql.c | |
| parent | 28ac1ba4edeb28812befab034eb0877cc8d4dac3 (diff) | |
| parent | 7df19a0939b7306320a0ea3ccbfe397c431bd135 (diff) | |
| download | mariadb-git-f2753fe9ac04edac1e8b968d29e77178b4e8c0a5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 829ee09090e..5c5898dfd7d 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -3460,7 +3460,6 @@ my_bool STDCALL mysql_more_results(MYSQL *mysql) /* Reads and returns the next query results */ - int STDCALL mysql_next_result(MYSQL *mysql) { DBUG_ENTER("mysql_next_result"); @@ -3479,8 +3478,8 @@ int STDCALL mysql_next_result(MYSQL *mysql) mysql->affected_rows= ~(my_ulonglong) 0; if (mysql->last_used_con->server_status & SERVER_MORE_RESULTS_EXISTS) - DBUG_RETURN((*mysql->methods->read_query_result)(mysql)); - + DBUG_RETURN((*mysql->methods->next_result)(mysql)); + DBUG_RETURN(-1); /* No more results */ } |