Fix manual-merge.

client/mysqltest.cc

@@ -6933,9 +6933,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
       Fetch info before fetching warnings, since it will be reset
       otherwise.
     */
-    {
-      ulonglong affected_rows;
-      LINT_INIT(affected_rows);
 
     if (!disable_info)
       append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql));
@@ -6962,10 +6959,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
                             ds_execute_warnings.length);
       }
     }
-
-      if (!disable_info)
-	append_info(ds, affected_rows, mysql_info(mysql));
-    }
   }
 
 end: