From: Date: February 28 2007 9:01am
Subject: bk commit into 4.1 tree (msvensson:1.2618) BUG#19410
List-Archive: http://lists.mysql.com/commits/20724
X-Bug: 19410
Message-Id: <200702280801.l1S81O4U002185@pilot.blaudden>

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-02-28 09:01:23+01:00, msvensson@stripped +1 -0
  Bug#19410 Test 'kill' fails on Windows + SCO
  - Use "mysql_stmt_field_count" to determine if there is a need to
   call "mysql_stmt_store_result"

  client/mysqltest.c@stripped, 2007-02-28 09:01:22+01:00, msvensson@stripped +1 -1
    Only call 'mysql_stmt_store_result' if 'mysql_stmt_field_count' is
    greater than 0 indicating that this query has a result set.
    This change is mainly since if mysql_stmt_store_result fails
    the value returned by mysql_stmt_field_count will be reset.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug19410/my41-bug19410

--- 1.242/client/mysqltest.c	2007-02-20 18:20:57 +01:00
+++ 1.243/client/mysqltest.c	2007-02-28 09:01:22 +01:00
@@ -5333,7 +5333,7 @@ void run_query_stmt(MYSQL *mysql, struct
     If we got here the statement succeeded and was expected to do so,
     get data. Note that this can still give errors found during execution!
   */
-  if (mysql_stmt_store_result(stmt))
+  if (mysql_stmt_field_count(stmt) && mysql_stmt_store_result(stmt))
   {
     handle_error(command, mysql_stmt_errno(stmt),
                  mysql_stmt_error(stmt), mysql_stmt_sqlstate(stmt), ds);