From 95362e0da87951f921e0700cd1237d00e52405fc Mon Sep 17 00:00:00 2001
From: Dmitry Shulga <Dmitry.Shulga@Sun.COM>
Date: Thu, 9 Sep 2010 19:36:57 +0700
Subject: Fix mysql_client_test failure introduced by a patch for Bug#47485.
 The problem was that mysql_stmt_next_result() (new to 5.5) was not properly
 updated.

libmysql/libmysql.c:
  mysql_stmt_next_result() modified: set mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT before return
  if there is a result set.
---
 libmysql/libmysql.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libmysql')

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 231b6e2ef76..a44395578c6 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -4874,6 +4874,9 @@ int STDCALL mysql_stmt_next_result(MYSQL_STMT *stmt)
     DBUG_RETURN(rc);
   }
 
+  if (mysql->status == MYSQL_STATUS_GET_RESULT)
+    mysql->status= MYSQL_STATUS_STATEMENT_GET_RESULT;
+
   stmt->state= MYSQL_STMT_EXECUTE_DONE;
   stmt->bind_result_done= FALSE;
 
-- 
cgit v1.2.1