Merge lp:~stewart/percona-server/5.1-bug1090596 into lp:percona-server/5.1

[Stewart Smith]

Make userstat_bug602047 a reliable test.

http://jenkins.percona.com/view/PS%205.1/job/percona-server-5.1-param/476/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/mysql-test/r/userstat_bug602047.result'
--- Percona-Server/mysql-test/r/userstat_bug602047.result	2011-11-24 01:59:48 +0000
+++ Percona-Server/mysql-test/r/userstat_bug602047.result	2012-12-17 00:13:28 +0000
@@ -1,4 +1,7 @@
 DROP TABLE IF EXISTS t1;
+FLUSH USER_STATISTICS;
+FLUSH TABLE_STATISTICS;
+FLUSH INDEX_STATISTICS;
 SET @userstat_running_old= @@userstat_running;
 SET GLOBAL userstat_running=ON;
 CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;

=== modified file 'Percona-Server/mysql-test/t/userstat_bug602047.test'
--- Percona-Server/mysql-test/t/userstat_bug602047.test	2011-11-24 01:59:48 +0000
+++ Percona-Server/mysql-test/t/userstat_bug602047.test	2012-12-17 00:13:28 +0000
@@ -2,6 +2,9 @@
 --disable_warnings
 DROP TABLE IF EXISTS t1; 
 --enable_warnings
+FLUSH USER_STATISTICS;
+FLUSH TABLE_STATISTICS;
+FLUSH INDEX_STATISTICS;
 SET @userstat_running_old= @@userstat_running;
 SET GLOBAL userstat_running=ON;
 CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;