[Pkg-mysql-commits] r1233 - in branches/etch-5.0/debian: . patches

[Norbert Tretkowski]

tags 463515 pending
thanks

Author: nobse
Date: 2008-05-15 18:03:25 +0000 (Thu, 15 May 2008)
New Revision: 1233

Added:
   branches/etch-5.0/debian/patches/52_network_timeouts.dpatch
Modified:
   branches/etch-5.0/debian/changelog
   branches/etch-5.0/debian/patches/00list
Log:
Fix corruption of the relay log caused by network timeouts between the master and the slave.

Modified: branches/etch-5.0/debian/changelog
===================================================================
--- branches/etch-5.0/debian/changelog	2008-05-15 17:58:10 UTC (rev 1232)
+++ branches/etch-5.0/debian/changelog	2008-05-15 18:03:25 UTC (rev 1233)
@@ -4,8 +4,10 @@
     scalar subqueries. (closes: #464218)
   * Fix InnoDB parser that sometimes did not account for null bytes, causing
     spurious failure of some queries. (closes: #475159)
+  * Fix corruption of the relay log caused by network timeouts between the
+    master and the slave. (closes: #463515)
 
- -- Norbert Tretkowski <nobse at debian.org>  Thu, 15 May 2008 19:56:28 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Thu, 15 May 2008 20:02:11 +0200
 
 mysql-dfsg-5.0 (5.0.32-7etch5) stable-security; urgency=high
 

Modified: branches/etch-5.0/debian/patches/00list
===================================================================
--- branches/etch-5.0/debian/patches/00list	2008-05-15 17:58:10 UTC (rev 1232)
+++ branches/etch-5.0/debian/patches/00list	2008-05-15 18:03:25 UTC (rev 1233)
@@ -30,3 +30,4 @@
 96_SECURITY_CVE-2008-0226+0227.dpatch
 50_explain_crash.dpatch
 51_innodb_parserbug.dpatch
+52_network_timeouts.dpatch

Added: branches/etch-5.0/debian/patches/52_network_timeouts.dpatch
===================================================================
--- branches/etch-5.0/debian/patches/52_network_timeouts.dpatch	                        (rev 0)
+++ branches/etch-5.0/debian/patches/52_network_timeouts.dpatch	2008-05-15 18:03:25 UTC (rev 1233)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_network_timeouts.dpatch by Norbert Tretkowski <nobse at debian.org>
+
+ at DPATCH@
+diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
+--- a/sql/sql_parse.cc	2007-10-30 16:20:29 +08:00
++++ b/sql/sql_parse.cc	2008-01-29 11:56:46 +08:00
+@@ -1999,7 +1999,6 @@ bool dispatch_command(enum enum_server_c
+       unregister_slave(thd,1,1);
+       /*  fake COM_QUIT -- if we get here, the thread needs to terminate */
+       error = TRUE;
+-      net->error = 0;
+       break;
+     }
+ #endif