From f347208ac9b85d01bf32a964f7f0fe2c28d864d4 Mon Sep 17 00:00:00 2001
From: "hf@deer.(none)" <>
Date: Wed, 11 Feb 2004 16:35:56 +0400
Subject: [PATCH] Addition to the fix for #2208 Made code shorter and more
 correct

---
 libmysql/client_settings.h |  1 -
 libmysql/libmysql.c        | 26 +++++++++-----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h
index 6a7da0bcc81..b1a85f567f9 100644
--- a/libmysql/client_settings.h
+++ b/libmysql/client_settings.h
@@ -58,7 +58,6 @@ int cli_stmt_execute(MYSQL_STMT *stmt);
 MYSQL_DATA * cli_read_binary_rows(MYSQL_STMT *stmt);
 int cli_unbuffered_fetch(MYSQL *mysql, char **row);
 const char * cli_read_statistic(MYSQL *mysql);
-int cli_next_result(MYSQL *mysql);
 
 #ifdef EMBEDDED_LIBRARY
 int init_embedded_server(int argc, char **argv, char **groups);
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index a3e88ccd03d..27eb9bd3857 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -3510,22 +3510,6 @@ my_bool STDCALL mysql_more_results(MYSQL *mysql)
 /*
   Reads and returns the next query results
 */
-
-int cli_next_result(MYSQL *mysql)
-{
-  DBUG_ENTER("cli_next_result");
-
-  mysql->net.last_error[0]= 0;
-  mysql->net.last_errno= 0;
-  strmov(mysql->net.sqlstate, not_error_sqlstate);
-  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(-1);				/* No more results */
-}
-
 int STDCALL mysql_next_result(MYSQL *mysql)
 {
   DBUG_ENTER("mysql_next_result");
@@ -3538,7 +3522,15 @@ int STDCALL mysql_next_result(MYSQL *mysql)
     DBUG_RETURN(1);
   }
 
-  DBUG_RETURN((*mysql->methods->next_result)(mysql));
+  mysql->net.last_error[0]= 0;
+  mysql->net.last_errno= 0;
+  strmov(mysql->net.sqlstate, not_error_sqlstate);
+  mysql->affected_rows= ~(my_ulonglong) 0;
+
+  if (mysql->last_used_con->server_status & SERVER_MORE_RESULTS_EXISTS)
+    DBUG_RETURN((*mysql->methods->next_result)(mysql));
+
+  DBUG_RETURN(-1);				/* No more results */
 }