bk commit into 5.1 tree (msvensson:1.2472)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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:02:28+01:00, msvensson@stripped +1 -0
  Merge pilot.blaudden:/home/msvensson/mysql/bug19410/my50-bug19410
  into  pilot.blaudden:/home/msvensson/mysql/bug19410/my51-bug19410
  MERGE: 1.1810.2372.124

  client/mysqltest.c@stripped, 2007-02-28 09:02:25+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.155.32.11

# 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/my51-bug19410/RESYNC

--- 1.277/client/mysqltest.c	2007-02-20 18:22:47 +01:00
+++ 1.278/client/mysqltest.c	2007-02-28 09:02:25 +01:00
@@ -5356,7 +5356,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);