[Pkg-mysql-commits] r1823 - in mysql-dfsg-5.1/branches/unstable/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2010-01-31 16:49:54 +0000 (Sun, 31 Jan 2010)
New Revision: 1823

Removed:
   mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Drop 11_binlog_wrong_offset.dpatch

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-01-31 16:46:08 UTC (rev 1822)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-01-31 16:49:54 UTC (rev 1823)
@@ -1,6 +1,9 @@
 mysql-dfsg-5.1 (5.1.43-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Drop patches:
+    + 11_binlog_wrong_offset.dpatch
+    + 96_SECURITY_CVE-2009-4484.dpatch
   * Include symlinks for mysqlcheck manpages. (closes: #558760)
   * Fix some lintian warnings:
     + debian-news-entry-has-unknown-version
@@ -8,7 +11,7 @@
     + postrm-has-useless-call-to-ldconfig
   * Bump Standards-Version to 3.8.4, no changes required.
 
- -- Norbert Tretkowski <nobse at debian.org>  Sun, 31 Jan 2010 17:43:41 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 31 Jan 2010 17:49:40 +0100
 
 mysql-dfsg-5.1 (5.1.41-4) unstable; urgency=high
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-01-31 16:46:08 UTC (rev 1822)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-01-31 16:49:54 UTC (rev 1823)
@@ -2,7 +2,6 @@
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
 10_readline_build_fix.dpatch
-11_binlog_wrong_offset.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
 41_scripts__mysql_install_db.sh__no_test.dpatch

Deleted: mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch	2010-01-31 16:46:08 UTC (rev 1822)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch	2010-01-31 16:49:54 UTC (rev 1823)
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_binlog_wrong_offset.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=48357
-
- at DPATCH@
-diff -Nur mysql-dfsg-5.1-5.1.42.orig/sql/log_event.cc mysql-dfsg-5.1-5.1.42/sql/log_event.cc
---- mysql-dfsg-5.1-5.1.42.orig/sql/log_event.cc	2009-12-16 18:57:26.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.42/sql/log_event.cc	2010-01-13 04:08:49.000000000 +0100
-@@ -2138,8 +2138,8 @@
- /**
-   Utility function for the next method (Query_log_event::write()) .
- */
--static void write_str_with_code_and_len(char **dst, const char *src,
--                                        int len, uint code)
-+static void write_str_with_code_and_len(uchar **dst, const char *src,
-+                                        uint len, uint code)
- {
-   /*
-     only 1 byte to store the length of catalog, so it should not
-@@ -2234,7 +2234,7 @@
-   }
-   if (catalog_len) // i.e. this var is inited (false for 4.0 events)
-   {
--    write_str_with_code_and_len((char **)(&start),
-+    write_str_with_code_and_len(&start,
-                                 catalog, catalog_len, Q_CATALOG_NZ_CODE);
-     /*
-       In 5.0.x where x<4 masters we used to store the end zero here. This was
-@@ -2272,7 +2272,7 @@
-   {
-     /* In the TZ sys table, column Name is of length 64 so this should be ok */
-     DBUG_ASSERT(time_zone_len <= MAX_TIME_ZONE_NAME_LENGTH);
--    write_str_with_code_and_len((char **)(&start),
-+    write_str_with_code_and_len(&start,
-                                 time_zone_str, time_zone_len, Q_TIME_ZONE_CODE);
-   }
-   if (lc_time_names_number)