bk commit into 5.0 tree (jimw:1.1844)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1844 05/05/17 16:59:39 jimw@stripped +1 -0
  Merge mysql.com:/home/jimw/my/mysql-5.0-10251
  into mysql.com:/home/jimw/my/mysql-5.0-clean

  client/mysqltest.c
    1.141 05/05/17 16:59:38 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.140/client/mysqltest.c	2005-05-06 04:43:05 -07:00
+++ 1.141/client/mysqltest.c	2005-05-17 16:59:38 -07:00
@@ -593,7 +593,7 @@
     printf("skipped\n");
   free_used_memory();
   my_end(MY_CHECK_ERROR);
-  exit(2);
+  exit(62);
 }
 
 static void verbose_msg(const char* fmt, ...)
@@ -2711,6 +2711,8 @@
 
     if (!disable_result_log)
     {
+      ulong affected_rows;    /* Ok to be undef if 'disable_info' is set */
+
       if (res)
       {
 	MYSQL_FIELD *field= mysql_fetch_fields(res);
@@ -2733,6 +2735,13 @@
       }
 
       /*
+        Need to call mysql_affected_rows() before the new
+        query to find the warnings
+      */
+      if (!disable_info)
+        affected_rows= (ulong)mysql_affected_rows(mysql);
+
+      /*
         Add all warnings to the result. We can't do this if we are in
         the middle of processing results from multi-statement, because
         this will break protocol.
@@ -2759,7 +2768,7 @@
       if (!disable_info)
       {
 	char buf[40];
-	sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql));
+	sprintf(buf,"affected rows: %lu\n", affected_rows);
 	dynstr_append(ds, buf);
 	if (mysql_info(mysql))
 	{