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

Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 504
Merged at revision: 507
Proposed branch: lp:~stewart/percona-server/5.1-bug1090596
Merge into: lp:percona-server/5.1
Diff against target: 25 lines (+6/-0)
2 files modified
Percona-Server/mysql-test/r/userstat_bug602047.result (+3/-0)
Percona-Server/mysql-test/t/userstat_bug602047.test (+3/-0)
To merge this branch: bzr merge lp:~stewart/percona-server/5.1-bug1090596
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+140115@code.launchpad.net

Description of the change

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/mysql-test/r/userstat_bug602047.result'
2--- Percona-Server/mysql-test/r/userstat_bug602047.result 2011-11-24 01:59:48 +0000
3+++ Percona-Server/mysql-test/r/userstat_bug602047.result 2012-12-17 00:13:28 +0000
4@@ -1,4 +1,7 @@
5 DROP TABLE IF EXISTS t1;
6+FLUSH USER_STATISTICS;
7+FLUSH TABLE_STATISTICS;
8+FLUSH INDEX_STATISTICS;
9 SET @userstat_running_old= @@userstat_running;
10 SET GLOBAL userstat_running=ON;
11 CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
12
13=== modified file 'Percona-Server/mysql-test/t/userstat_bug602047.test'
14--- Percona-Server/mysql-test/t/userstat_bug602047.test 2011-11-24 01:59:48 +0000
15+++ Percona-Server/mysql-test/t/userstat_bug602047.test 2012-12-17 00:13:28 +0000
16@@ -2,6 +2,9 @@
17 --disable_warnings
18 DROP TABLE IF EXISTS t1;
19 --enable_warnings
20+FLUSH USER_STATISTICS;
21+FLUSH TABLE_STATISTICS;
22+FLUSH INDEX_STATISTICS;
23 SET @userstat_running_old= @@userstat_running;
24 SET GLOBAL userstat_running=ON;
25 CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;

Subscribers

People subscribed via source and target branches