Bug#39663 mysqltest: --enable_info, affected_rows and ps-protocol broken

1 files changed, 11 insertions, 1 deletions

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 4f8e6cdac99..fb33d30da81 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -6346,6 +6346,16 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
       */
     }
 
+    /*
+      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 st_command *command,
     }
 
     if (!disable_info)
-      append_info(ds, mysql_affected_rows(mysql), mysql_info(mysql));
+      append_info(ds, affected_rows, mysql_info(mysql));
 
   }