bk commit into 4.1 tree (kent:1.2237) BUG#8455

[kent]

Below is the list of changes that have just been committed into a local
4.1 repository of kent. When kent 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.2237 05/05/16 01:08:42 kent@stripped +1 -0
  mysqltest.c:
    To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings

  client/mysqltest.c
    1.163 05/05/16 01:04:14 kent@stripped +10 -1
    To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings

# 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:	kent
# Host:	g4.boortz.dyndns.org
# Root:	/Users/kent/mysql/bk/mysql-4.1

--- 1.162/client/mysqltest.c	2005-05-15 20:33:34 +02:00
+++ 1.163/client/mysqltest.c	2005-05-16 01:04:14 +02:00
@@ -2597,6 +2597,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);
@@ -2619,6 +2621,13 @@
 	append_result(ds, res);
       }
 
+      /*
+        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 */
       if (!disable_warnings && mysql_warning_count(mysql))
       {
@@ -2641,7 +2650,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))
 	{