Merge lp:~percona-dev/percona-server/release-5.1.47-11-fixbug590627 into lp:percona-server/release-5.1.47-12

Proposed by Aleksandr Kuzminsky
Status: Merged
Approved by: Vadim Tkachenko
Approved revision: no longer in the source branch.
Merged at revision: 40
Proposed branch: lp:~percona-dev/percona-server/release-5.1.47-11-fixbug590627
Merge into: lp:percona-server/release-5.1.47-12
Diff against target: 15 lines (+8/-0)
1 file modified
mysql-test.diff (+8/-0)
To merge this branch: bzr merge lp:~percona-dev/percona-server/release-5.1.47-11-fixbug590627
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+27574@code.launchpad.net

Description of the change

The test should be fixed in -12 branch too

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mysql-test.diff'
2--- mysql-test.diff 2010-06-04 12:53:04 +0000
3+++ mysql-test.diff 2010-06-15 04:40:45 +0000
4@@ -942,3 +942,11 @@
5 @@ -1 +1 @@
6 ---log-slow-queries
7 +--log-output=table,file --log-slow-queries
8+diff -Nur a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
9+--- a/mysql-test/t/disabled.def 2010-06-08 22:46:28.000000000 -0700
10++++ b/mysql-test/t/disabled.def 2010-06-08 22:49:03.000000000 -0700
11+@@ -13,3 +13,4 @@
12+ query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
13+ partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings
14+ ps_3innodb : Bug#53309 2010-04-30 VasilDimov valgrind warnings
15++alter_table-big : Bug#590627 2010-06-09 Fails on MySQL 5.1.47

Subscribers

People subscribed via source and target branches

to all changes: