merge

Makefile.am

@@ -196,6 +196,10 @@ test-bt-fast:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
 
+test-bt-fast:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol --report-features
+
 test-bt-debug:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	    @PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \
@@ -203,6 +207,8 @@ test-bt-debug:
 
 test-bt-debug-fast:
 
+test-bt-debug-fast:
+
 # Keep these for a while
 test-pl:	test
 test-full-pl:	test-full

client/mysqltest.cc

@@ -6913,6 +6913,10 @@ 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);
 
@@ -6941,7 +6945,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
 
       if (!disable_info)
 	append_info(ds, affected_rows, mysql_info(mysql));
-
+    }
   }
 
 end: