bzr commit into mysql-5.5-merge branch (Dmitry.Shulga:3196) Bug#47485

[Dmitry Shulga]

#At file:///Users/shulga/projects/mysql/mysql-5.5-merge/ based on revid:dmitry.shulga@stripped

 3196 Dmitry Shulga	2010-09-09
      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.

    modified:
      libmysql/libmysql.c
=== modified file 'libmysql/libmysql.c'
--- a/libmysql/libmysql.c	2010-09-07 07:49:47 +0000
+++ b/libmysql/libmysql.c	2010-09-09 12:35:14 +0000
@@ -4874,6 +4874,9 @@ int STDCALL mysql_stmt_next_result(MYSQL
     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;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]