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

[Norbert Tretkowski]

tags 463515 pending
thanks

Author: nobse
Date: 2008-09-03 07:17:36 +0000 (Wed, 03 Sep 2008)
New Revision: 1310

Added:
   trunk/debian/patches/59_fix_relay_logs_corruption.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
Fix corruption in relay logs.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-08-12 12:11:42 UTC (rev 1309)
+++ trunk/debian/changelog	2008-09-03 07:17:36 UTC (rev 1310)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.0 (5.0.51a-13) UNRELEASED; urgency=low
+
+  * New patch 59_fix_relay_logs_corruption.dpatch from 5.0.56 to fix
+    corruption in relay logs. (closes: #463515)
+
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 03 Sep 2008 09:13:46 +0200
+
 mysql-dfsg-5.0 (5.0.51a-12) unstable; urgency=low
 
   * Disable rpl_ndb_innodb_trans test when running the testsuite, fails

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-08-12 12:11:42 UTC (rev 1309)
+++ trunk/debian/patches/00list	2008-09-03 07:17:36 UTC (rev 1310)
@@ -15,6 +15,7 @@
 56_fix_order_by.dpatch
 57_fix_mysql_replication.dpatch
 58_disable-ndb-backup-print.dpatch
+59_fix_relay_logs_corruption.dpatch
 80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch

Added: trunk/debian/patches/59_fix_relay_logs_corruption.dpatch
===================================================================
--- trunk/debian/patches/59_fix_relay_logs_corruption.dpatch	                        (rev 0)
+++ trunk/debian/patches/59_fix_relay_logs_corruption.dpatch	2008-09-03 07:17:36 UTC (rev 1310)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 59_fix_relay_logs_corruption.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.mysql.com/26489
+
+ 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