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

[Norbert Tretkowski]

Author: nobse
Date: 2010-01-13 03:10:10 +0000 (Wed, 13 Jan 2010)
New Revision: 1798

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch
Removed:
   mysql-dfsg-5.1/branches/unstable/debian/patches/11_fix_c99_aliasing_violation.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
New patch 11_binlog_wrong_offset.dpatch to fix an undefined behaviour when building with gcc 4.4.x.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-01-01 12:38:47 UTC (rev 1797)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-01-13 03:10:10 UTC (rev 1798)
@@ -1,9 +1,8 @@
 mysql-dfsg-5.1 (5.1.42-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * New patch 11_fix_c99_aliasing_violation.dpatch to fix C99 aliasing
-    violation due to mismatched types that were papered over with a cast.
-    (closes: #554207)
+  * New patch 11_binlog_wrong_offset.dpatch to fix an undefined behaviour
+    when building with gcc 4.4.x. (closes: #554207)
   * Include symlinks for mysqlcheck manpages. (closes: #558760)
 
  -- Norbert Tretkowski <nobse at debian.org>  Fri, 01 Jan 2010 13:37:54 +0100

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-01-01 12:38:47 UTC (rev 1797)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-01-13 03:10:10 UTC (rev 1798)
@@ -2,7 +2,7 @@
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
 10_readline_build_fix.dpatch
-11_fix_c99_aliasing_violation.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

Added: 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	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/11_binlog_wrong_offset.dpatch	2010-01-13 03:10:10 UTC (rev 1798)
@@ -0,0 +1,39 @@
+#! /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)

Deleted: mysql-dfsg-5.1/branches/unstable/debian/patches/11_fix_c99_aliasing_violation.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/11_fix_c99_aliasing_violation.dpatch	2010-01-01 12:38:47 UTC (rev 1797)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/11_fix_c99_aliasing_violation.dpatch	2010-01-13 03:10:10 UTC (rev 1798)
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_gcc-4.4_binlog_tests.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=48284
-
- at DPATCH@
-diff -Nur mysql-dfsg-5.1-5.1.41.orig/libmysql/libmysql.c mysql-dfsg-5.1-5.1.41/libmysql/libmysql.c
---- mysql-dfsg-5.1-5.1.41.orig/libmysql/libmysql.c	2009-11-04 19:28:17.000000000 +0100
-+++ mysql-dfsg-5.1-5.1.41/libmysql/libmysql.c	2009-12-10 09:04:17.542474366 +0100
-@@ -2285,7 +2285,7 @@
- 
- /* Store type of parameter in network buffer. */
- 
--static void store_param_type(char **pos, MYSQL_BIND *param)
-+static void store_param_type(unsigned char **pos, MYSQL_BIND *param)
- {
-   uint typecode= param->buffer_type | (param->is_unsigned ? 32768 : 0);
-   int2store(*pos, typecode);
-@@ -2565,7 +2565,7 @@
- 	that is sent to the server.
-       */
-       for (param= stmt->params;	param < param_end ; param++)
--        store_param_type((char**) &net->write_pos, param);
-+	store_param_type(&net->write_pos, param);
-     }
- 
-     for (param= stmt->params; param < param_end; param++)