[Pkg-mysql-commits] r2239 - in mysql-5.5/branches/unstable/debian: . patches

[Clint Byrum]

Author: spamaps-guest
Date: 2013-09-13 15:49:40 +0000 (Fri, 13 Sep 2013)
New Revision: 2239

Added:
   mysql-5.5/branches/unstable/debian/patches/work_around_failing_rpl_deadlock_test.patch
Modified:
   mysql-5.5/branches/unstable/debian/changelog
   mysql-5.5/branches/unstable/debian/patches/series
Log:
d/patches/work_around_failing_rpl_deadlock.patch: Test suite
changes upstream have left some connections active. This
patch fixes that. Thanks Kristian Nielsen!

Modified: mysql-5.5/branches/unstable/debian/changelog
===================================================================
--- mysql-5.5/branches/unstable/debian/changelog	2013-08-11 14:36:53 UTC (rev 2238)
+++ mysql-5.5/branches/unstable/debian/changelog	2013-09-13 15:49:40 UTC (rev 2239)
@@ -8,6 +8,9 @@
     SECURITY UPDATE: CVE-2013-1861 CVE-2013-3783 CVE-2013-3793
     CVE-2013-3804 CVE-2013-3802 CVE-2013-3809 CVE-2013-3812
     (Closes: #706715) (Closes: #712730)
+  * d/patches/work_around_failing_rpl_deadlock.patch: Test suite
+    changes upstream have left some connections active. This
+    patch fixes that. Thanks Kristian Nielsen!
 
  -- Clint Byrum <clint at ubuntu.com>  Wed, 08 May 2013 13:11:27 -0700
 

Modified: mysql-5.5/branches/unstable/debian/patches/series
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/series	2013-08-11 14:36:53 UTC (rev 2238)
+++ mysql-5.5/branches/unstable/debian/patches/series	2013-09-13 15:49:40 UTC (rev 2239)
@@ -9,3 +9,4 @@
 regex_plus.patch
 versioned_symbols.patch
 fix-mips64el-ftbfs.patch
+work_around_failing_rpl_deadlock_test.patch

Added: mysql-5.5/branches/unstable/debian/patches/work_around_failing_rpl_deadlock_test.patch
===================================================================
--- mysql-5.5/branches/unstable/debian/patches/work_around_failing_rpl_deadlock_test.patch	                        (rev 0)
+++ mysql-5.5/branches/unstable/debian/patches/work_around_failing_rpl_deadlock_test.patch	2013-09-13 15:49:40 UTC (rev 2239)
@@ -0,0 +1,22 @@
+From: Kristian Nielsen <knielsen at knielsen-hq.org>
+Origin: https://gist.github.com/knielsen/6540045
+Bug: http://bugs.mysql.com/bug.php?id=69458
+Description: There is a bug in the test suite that leaves behind dirty
+ temp files. This change forces mysqld to clean them up by disconnecting.
+
+Index: mysql-5.5-5.5.33+dfsg/mysql-test/extra/rpl_tests/rpl_innodb.test
+===================================================================
+--- mysql-5.5-5.5.33+dfsg.orig/mysql-test/extra/rpl_tests/rpl_innodb.test	2013-07-15 05:01:49.000000000 -0700
++++ mysql-5.5-5.5.33+dfsg/mysql-test/extra/rpl_tests/rpl_innodb.test	2013-09-13 08:17:10.902875508 -0700
+@@ -114,6 +114,11 @@
+ FLUSH LOGS;
+ 
+ DROP DATABASE mysqltest1;
++# The temporary table mysqltest1.tmp2 is only dropped on the slave when the
++# owning connection on the master is closed. So do that now to not leave a
++# temporary table file around after this test terminates.
++disconnect master;
++connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
+ 
+ --echo End of 5.1 tests
+