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

[Norbert Tretkowski]

Author: nobse
Date: 2010-06-17 20:39:24 +0000 (Thu, 17 Jun 2010)
New Revision: 1888

Added:
   mysql-dfsg-5.1/branches/unstable/debian/patches/10_sql_connect_build_fix.dpatch
Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/patches/00list
Log:
Don't drop patch.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-06-17 19:14:51 UTC (rev 1887)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2010-06-17 20:39:24 UTC (rev 1888)
@@ -1,9 +1,8 @@
 mysql-5.1 (5.1.48-1) unstable; urgency=low
 
   * New upstream release.
-  * Drop patch added in last upload.
 
- -- Norbert Tretkowski <norbert at tretkowski.de>  Thu, 17 Jun 2010 19:48:07 +0200
+ -- Norbert Tretkowski <norbert at tretkowski.de>  Thu, 17 Jun 2010 22:38:56 +0200
 
 mysql-5.1 (5.1.47-1) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/patches/00list
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-06-17 19:14:51 UTC (rev 1887)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/00list	2010-06-17 20:39:24 UTC (rev 1888)
@@ -1,6 +1,7 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
 02_no_builtin_ndbcluster_plugin.dpatch
+10_sql_connect_build_fix.dpatch
 20_disabled_tests.dpatch
 33_scripts__mysql_create_system_tables__no_test.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch

Added: mysql-dfsg-5.1/branches/unstable/debian/patches/10_sql_connect_build_fix.dpatch
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/patches/10_sql_connect_build_fix.dpatch	                        (rev 0)
+++ mysql-dfsg-5.1/branches/unstable/debian/patches/10_sql_connect_build_fix.dpatch	2010-06-17 20:39:24 UTC (rev 1888)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_sql_connect_build_fix.dpatch by Norbert Tretkowski <norbert at tretkowski.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: http://bugs.mysql.com/bug.php?id=53912
+
+ at DPATCH@
+diff -Nur mysql-5.1.47.orig/sql/sql_connect.cc mysql-5.1.47/sql/sql_connect.cc
+--- mysql-5.1.47.orig/sql/sql_connect.cc	2010-05-06 17:27:31.000000000 +0200
++++ mysql-5.1.47/sql/sql_connect.cc	2010-05-22 11:38:52.132352572 +0200
+@@ -477,7 +477,9 @@
+         big packets indefinitely, this is a previously established behavior
+         that needs to be preserved as to not break backwards compatibility.
+       */
++#if defined(MYSQL_SERVER) && !defined(EMBEDDED_LIBRARY)
+       thd->net.skip_big_packet= TRUE;
++#endif
+       /* Ready to handle queries */
+       DBUG_RETURN(0);
+     }