bzr commit into mysql-5.0-bugteam branch (frazer:2817) Bug#39663

[Frazer Clement]

#At file:///home/frazer/bzr/mysql-5.0-bugteam/

 2817 Frazer Clement	2009-10-02
      Bug#39663 mysqltest: --enable_info, affected_rows and ps-protocol broken
      modified:
        client/mysqltest.c

=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c	2009-09-09 18:52:17 +0000
+++ b/client/mysqltest.c	2009-10-02 18:56:31 +0000
@@ -6346,6 +6346,16 @@ void run_query_stmt(MYSQL *mysql, struct
       */
     }
 
+    /*
+      Need to grab affected rows information before getting
+      warnings here
+    */
+    ulonglong affected_rows;
+    LINT_INIT(affected_rows);
+
+    if (!disable_info)
+      affected_rows= mysql_affected_rows(mysql);
+
     if (!disable_warnings)
     {
       /* Get the warnings from execute */
@@ -6370,7 +6380,7 @@ void run_query_stmt(MYSQL *mysql, struct
     }
 
     if (!disable_info)
-      append_info(ds, mysql_affected_rows(mysql), mysql_info(mysql));
+      append_info(ds, affected_rows, mysql_info(mysql));
 
   }