[Pkg-mysql-commits] r1322 - in trunk/debian: . patches

Norbert Tretkowski nobse at alioth.debian.org
Thu Oct 9 06:53:31 UTC 2008 

Author: nobse
Date: 2008-10-09 06:53:30 +0000 (Thu, 09 Oct 2008)
New Revision: 1322

Added:
   trunk/debian/patches/60_rpl_test_failure.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
   trunk/debian/patches/58_disable-testsuite-tests.dpatch
Log:
New patch 60_rpl_test_failure.dpatch from Michael Casadevall to fix a race condition with the rpl_packet test in some cases.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-10-07 12:57:25 UTC (rev 1321)
+++ trunk/debian/changelog	2008-10-09 06:53:30 UTC (rev 1322)
@@ -5,10 +5,10 @@
     command-line client, when the --html option is enabled, allows attackers
     to inject arbitrary web script or HTML by placing it in a database cell,
     which might be accessed by this client when composing an HTML document. 
-  * Disable rpl_packet test when running the testsuite, fails randomly on
-    i386. (closes: #501413)
+  * New patch 60_rpl_test_failure.dpatch from Michael Casadevall to fix a race
+    condition with the rpl_packet test in some cases. (closes: #501413)
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 07 Oct 2008 13:01:58 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Thu, 09 Oct 2008 08:50:43 +0200
 
 mysql-dfsg-5.0 (5.0.51a-15) unstable; urgency=high
 

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-10-07 12:57:25 UTC (rev 1321)
+++ trunk/debian/patches/00list	2008-10-09 06:53:30 UTC (rev 1322)
@@ -16,6 +16,7 @@
 57_fix_mysql_replication.dpatch
 58_disable-testsuite-tests.dpatch
 59_fix_relay_logs_corruption.dpatch
+60_fix_rpl_path_test.dpatch
 80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch

Modified: trunk/debian/patches/58_disable-testsuite-tests.dpatch
===================================================================
--- trunk/debian/patches/58_disable-testsuite-tests.dpatch	2008-10-07 12:57:25 UTC (rev 1321)
+++ trunk/debian/patches/58_disable-testsuite-tests.dpatch	2008-10-09 06:53:30 UTC (rev 1322)
@@ -8,7 +8,7 @@
 diff -Nur mysql-dfsg-5.0-5.0.51a.orig/mysql-test/t/disabled.def mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def
 --- mysql-dfsg-5.0-5.0.51a.orig/mysql-test/t/disabled.def	2008-01-11 16:23:06.000000000 +0100
 +++ mysql-dfsg-5.0-5.0.51a/mysql-test/t/disabled.def	2008-10-07 12:43:42.000000000 +0200
-@@ -16,3 +16,9 @@
+@@ -16,3 +16,8 @@
  im_options_set       : Bug#20294: Instance manager tests fail randomly
  im_options_unset     : Bug#20294: Instance manager tests fail randomly
  im_utils             : Bug#20294: Instance manager tests fail randomly
@@ -17,4 +17,3 @@
 +ndb_replace          : failed for some reason
 +innodb_handler       : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491363
 +rpl_ndb_innodb_trans : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=494238
-+rpl_packet           : http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=501413

Added: trunk/debian/patches/60_rpl_test_failure.dpatch
===================================================================
--- trunk/debian/patches/60_rpl_test_failure.dpatch	                        (rev 0)
+++ trunk/debian/patches/60_rpl_test_failure.dpatch	2008-10-09 06:53:30 UTC (rev 1322)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_fix_rpl_path_test.dpatch by Michael Casadevall <sonicmctails at gmail.com>
+##
+## DP: Bug MySQL #30209 - race condition with the rpl_packet test in some cases.
+## DP: Fix backported from current MySQL test suite
+
+ at DPATCH@
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysql-test/r/rpl_packet.result
+mysql-dfsg-5.0-5.0.51a/mysql-test/r/rpl_packet.result
+--- mysql-dfsg-5.0-5.0.51a~/mysql-test/r/rpl_packet.result      2008-01-11
+10:23:41.000000000 -0500
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/r/rpl_packet.result       2008-10-08
+20:19:05.000000000 -0400
+@@ -21,6 +21,37 @@
+ START SLAVE;
+ CREATE TABLe `t1` (`f1` LONGTEXT) ENGINE=MyISAM;
+ INSERT INTO `t1`(`f1`) VALUES
+('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2048');
+-SHOW STATUS LIKE 'Slave_running';
+-Variable_name  Value
+-Slave_running  OFF
++show slave status;
++Slave_IO_State #
++Master_Host    127.0.0.1
++Master_User    root
++Master_Port    MASTER_MYPORT
++Connect_Retry  1
++Master_Log_File        master-bin.000001
++Read_Master_Log_Pos    2138
++Relay_Log_File #
++Relay_Log_Pos  #
++Relay_Master_Log_File  master-bin.000001
++Slave_IO_Running       No
++Slave_SQL_Running      #
++Replicate_Do_DB        
++Replicate_Ignore_DB    
++Replicate_Do_Table     
++Replicate_Ignore_Table 
++Replicate_Wild_Do_Table        
++Replicate_Wild_Ignore_Table    
++Last_Errno     0
++Last_Error     
++Skip_Counter   0
++Exec_Master_Log_Pos    2138
++Relay_Log_Space        #
++Until_Condition        None
++Until_Log_File 
++Until_Log_Pos  0
++Master_SSL_Allowed     No
++Master_SSL_CA_File     
++Master_SSL_CA_Path     
++Master_SSL_Cert        
++Master_SSL_Cipher      
++Master_SSL_Key 
++Seconds_Behind_Master  #
+diff -urNad mysql-dfsg-5.0-5.0.51a~/mysql-test/t/rpl_packet.test
+mysql-dfsg-5.0-5.0.51a/mysql-test/t/rpl_packet.test
+--- mysql-dfsg-5.0-5.0.51a~/mysql-test/t/rpl_packet.test        2008-01-11
+10:23:21.000000000 -0500
++++ mysql-dfsg-5.0-5.0.51a/mysql-test/t/rpl_packet.test 2008-10-08
+20:20:17.000000000 -0400
+@@ -64,9 +64,11 @@
+ INSERT INTO `t1`(`f1`) VALUES
+('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa2048');
+
+ # The slave I/O thread must stop after trying to read the above event
+-connection slave;
+-sleep 2;
+-SHOW STATUS LIKE 'Slave_running';
+-
++connection slave;
++--source include/wait_for_slave_io_to_stop.inc
++--replace_result $MASTER_MYPORT MASTER_MYPORT
++# import is only the 11th column Slave_IO_Running
++--replace_column 1 # 8 # 9 # 12 # 23 # 33 #
++query_vertical show slave status;
+
+ # End of tests
+

More information about the Pkg-mysql-commits mailing list