summaryrefslogtreecommitdiff
path: root/debian/patches/71_disable_rpl_tests.patch
diff options
context:
space:
mode:
authorspamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2013-03-08 16:52:49 +0000
committerspamaps-guest <spamaps-guest@bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1>2013-03-08 16:52:49 +0000
commit2a4346f0d10ef08fa53716465de590e2a8e1877c (patch)
tree7a1151b9e8d2c051b224aa394955672ba913fcd1 /debian/patches/71_disable_rpl_tests.patch
parent7f39f5296ffd577cfaf72c63991a5997883908c8 (diff)
downloadmysql-5.5-2a4346f0d10ef08fa53716465de590e2a8e1877c.tar.gz
* New upstream release.
* d/p/rpl_mariadb_test.patch - test for fix of CVE-2012-4414 git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2216 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1
Diffstat (limited to 'debian/patches/71_disable_rpl_tests.patch')
-rw-r--r--debian/patches/71_disable_rpl_tests.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/71_disable_rpl_tests.patch b/debian/patches/71_disable_rpl_tests.patch
index 7c34cba..e450fc7 100644
--- a/debian/patches/71_disable_rpl_tests.patch
+++ b/debian/patches/71_disable_rpl_tests.patch
@@ -3,12 +3,12 @@ Bug-Ubuntu: http://pad.lv/894146
Forwarded: no, not needed
Description: disables test to allow build to pass while this is investigated.
-Index: mysql-5.5.29/mysql-test/suite/rpl/t/disabled.def
+Index: mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def
===================================================================
---- mysql-5.5.29.orig/mysql-test/suite/rpl/t/disabled.def 2013-01-02 15:36:15.226363842 -0800
-+++ mysql-5.5.29/mysql-test/suite/rpl/t/disabled.def 2013-01-02 15:38:12.591482068 -0800
-@@ -15,3 +15,4 @@
+--- mysql-5.5-5.5.30+dfsg.orig/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.338697730 -0800
++++ mysql-5.5-5.5.30+dfsg/mysql-test/suite/rpl/t/disabled.def 2013-03-05 05:45:15.334697964 -0800
+@@ -14,3 +14,4 @@
+ rpl_spec_variables : BUG#11755836 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock
- rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out
+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146