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

[Norbert Tretkowski]

Author: nobse
Date: 2008-04-26 13:06:27 +0000 (Sat, 26 Apr 2008)
New Revision: 1197

Added:
   trunk/debian/patches/57_fix-mysql-replication.dpatch
Modified:
   trunk/debian/changelog
Log:
New patch 57_fix-mysql-replication.dpatch from 5.0.54 to fix directory for relay logs when using replication.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-04-26 12:53:33 UTC (rev 1196)
+++ trunk/debian/changelog	2008-04-26 13:06:27 UTC (rev 1197)
@@ -1,3 +1,10 @@
+mysql-dfsg-5.0 (5.0.51a-5) UNRELEASED; urgency=low
+
+  * New patch 57_fix-mysql-replication.dpatch from 5.0.54 to fix directory for
+    relay logs when using replication.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 26 Apr 2008 15:04:56 +0200
+
 mysql-dfsg-5.0 (5.0.51a-4) unstable; urgency=low
 
   [ Monty Taylor ]

Added: trunk/debian/patches/57_fix-mysql-replication.dpatch
===================================================================
--- trunk/debian/patches/57_fix-mysql-replication.dpatch	                        (rev 0)
+++ trunk/debian/patches/57_fix-mysql-replication.dpatch	2008-04-26 13:06:27 UTC (rev 1197)
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 57_fix-mysql-replication.dpatch by Norbert Tretkowski <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.mysql.com/bug.php?id=28597
+
+ at DPATCH@
+diff -Nrup a/mysql-test/t/rpl_dual_pos_advance.test b/mysql-test/t/rpl_dual_pos_advance.test
+--- a/mysql-test/t/rpl_dual_pos_advance.test	2007-03-20 12:15:14 +02:00
++++ b/mysql-test/t/rpl_dual_pos_advance.test	2007-11-05 17:20:08 +02:00
+@@ -106,9 +106,3 @@ connection slave;
+ sync_with_master;
+ 
+ # End of 4.1 tests
+-
+-# Cleanup
+-# The A->B->A replication causes the master to start writing relay logs
+-# in var/run, remove them
+-remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.000001;
+-remove_file $MYSQLTEST_VARDIR/run/master-relay-bin.index;
+diff -Nrup a/mysql-test/t/rpl_temporary.test b/mysql-test/t/rpl_temporary.test
+--- a/mysql-test/t/rpl_temporary.test	2007-02-27 15:54:31 +02:00
++++ b/mysql-test/t/rpl_temporary.test	2007-11-05 17:20:08 +02:00
+@@ -211,6 +211,8 @@ select * from t1;
+ connection master; 
+ drop table t1;
+ 
++--remove_file $MYSQLTEST_VARDIR/tmp/bug14157.sql
++
+ # Delete the anonymous users
+ source include/delete_anonymous_users.inc;
+ 
+diff -Nrup a/sql/log.cc b/sql/log.cc
+--- a/sql/log.cc	2007-07-30 18:27:30 +03:00
++++ b/sql/log.cc	2007-11-05 17:20:08 +02:00
+@@ -448,13 +448,10 @@ const char *MYSQL_LOG::generate_name(con
+ {
+   if (!log_name || !log_name[0])
+   {
+-    /*
+-      TODO: The following should be using fn_format();  We just need to
+-      first change fn_format() to cut the file name if it's too long.
+-    */
+-    strmake(buff, pidfile_name,FN_REFLEN-5);
+-    strmov(fn_ext(buff),suffix);
+-    return (const char *)buff;
++    strmake(buff, pidfile_name, FN_REFLEN - strlen(suffix) - 1);
++    return (const char *)
++      fn_format(buff, buff, "", suffix, MYF(MY_REPLACE_EXT|MY_REPLACE_DIR));
++
+   }
+   // get rid of extension if the log is binary to avoid problems
+   if (strip_ext)