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

[Norbert Tretkowski]

tags 554207 pending
thanks

Author: nobse
Date: 2009-12-10 08:07:00 +0000 (Thu, 10 Dec 2009)
New Revision: 1795

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/11_gcc-4.4_binlog_tests.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
New patch 11_gcc-4.4_binlog_tests.dpatch to fix C99 aliasing violation due to mismatched types that were papered over with a cast.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-12-07 19:12:40 UTC (rev 1794)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-12-10 08:07:00 UTC (rev 1795)
@@ -1,8 +1,10 @@
 mysql-dfsg-5.1 (5.1.41-4) UNRELEASED; urgency=low
 
+  * New patch 11_gcc-4.4_binlog_tests.dpatch to fix C99 aliasing violation due
+    to mismatched types that were papered over with a cast. (closes: #554207)
   * Include symlinks for mysqlcheck manpages. (closes: #558760)
 
- -- Norbert Tretkowski <nobse at debian.org>  Mon, 30 Nov 2009 12:46:24 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Thu, 10 Dec 2009 09:05:36 +0100
 
 mysql-dfsg-5.1 (5.1.41-3) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2009-12-07 19:12:40 UTC (rev 1794)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2009-12-10 08:07:00 UTC (rev 1795)
@@ -2,6 +2,7 @@
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
 10_readline_build_fix.dpatch
+11_gcc-4.4_binlog_tests.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_gcc-4.4_binlog_tests.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/11_gcc-4.4_binlog_tests.dpatch	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/11_gcc-4.4_binlog_tests.dpatch	2009-12-10 08:07:00 UTC (rev 1795)
@@ -0,0 +1,28 @@
+#! /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++)