Percona Server moved to https://jira.percona.com/projects/PS

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

  1. 5.1-bug1090596
  2. Merge into 5.1
Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
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

Make userstat_bug602047 a reliable test.

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

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1DROP TABLE IF EXISTS t1;1DROP TABLE IF EXISTS t1;
2FLUSH USER_STATISTICS;
3FLUSH TABLE_STATISTICS;
4FLUSH INDEX_STATISTICS;
2SET @userstat_running_old= @@userstat_running;5SET @userstat_running_old= @@userstat_running;
3SET GLOBAL userstat_running=ON;6SET GLOBAL userstat_running=ON;
4CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;7CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;
58
=== 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 @@
2--disable_warnings2--disable_warnings
3DROP TABLE IF EXISTS t1; 3DROP TABLE IF EXISTS t1;
4--enable_warnings4--enable_warnings
5FLUSH USER_STATISTICS;
6FLUSH TABLE_STATISTICS;
7FLUSH INDEX_STATISTICS;
5SET @userstat_running_old= @@userstat_running;8SET @userstat_running_old= @@userstat_running;
6SET GLOBAL userstat_running=ON;9SET GLOBAL userstat_running=ON;
7CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;10CREATE TABLE t1 ( id int(10), PRIMARY KEY (id)) ENGINE=InnoDB;

Subscribers

People subscribed via source and target branches