[Pkg-mysql-commits] r1035 - in branches/sid-5.0/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-01 14:39:47 +0000 (Sat, 01 Dec 2007)
New Revision: 1035

Removed:
   branches/sid-5.0/debian/patches/91_bug29389.dpatch
Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/patches/00list
Log:
Patch not necessary in 5.0.51

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-11-30 20:52:21 UTC (rev 1034)
+++ branches/sid-5.0/debian/changelog	2007-12-01 14:39:47 UTC (rev 1035)
@@ -1,21 +1,21 @@
 mysql-dfsg-5.0 (5.0.51-1) UNRELEASED; urgency=low
 
   * New upstream release (not yet released).
+    + Fix a crash in mysql_client_test due to gcc 4.x optimizations.
+      (closes: #452558)
   * Re-add manpages, they are licensed under GPL now and redistribution is
     permitted.
   * Drop linux-libc-dev build-dependency, it's now being pulled by libc-dev
     which is build-essential. (closes: #431018)
   * Remove old optimizations for MySQL 3.23.x, they are no longer required.
     (closes: #436552)
-  * New patch from Ubuntu to fix a crash in mysql_client_test due to gcc 4.x
-    optimizations. (closes: #452558)
   * Don't fail when upgrading mysql-common if $datadir is empty or not defined
     (patch from Edward Allcutt). (closes: #453127)
   * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
   * Run testsuite after build (but skip ndb tests for now).
   * Add Vcs-* and Homepage flags to source stanza in control file.
 
- -- Norbert Tretkowski <nobse at debian.org>  Fri, 30 Nov 2007 20:55:06 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 01 Dec 2007 15:38:24 +0100
 
 mysql-dfsg-5.0 (5.0.45-3) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list	2007-11-30 20:52:21 UTC (rev 1034)
+++ branches/sid-5.0/debian/patches/00list	2007-12-01 14:39:47 UTC (rev 1035)
@@ -11,5 +11,4 @@
 88_mctype_attrib.dpatch
 89_ndb__staticlib.dpatch
 90_upstreamdebiandir.dpatch
-91_bug29389.dpatch
 91_SECURITY_CVE-2007-5925.dpatch

Deleted: branches/sid-5.0/debian/patches/91_bug29389.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/91_bug29389.dpatch	2007-11-30 20:52:21 UTC (rev 1034)
+++ branches/sid-5.0/debian/patches/91_bug29389.dpatch	2007-12-01 14:39:47 UTC (rev 1035)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91_bug29389.dpatch by Jamie Strandboge <jamie at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix for bug29389
-
- at DPATCH@
-
-diff -Nru mysql-dfsg-5.0-5.0.45.orig/libmysql/libmysql.c mysql-dfsg-5.0-5.0.45/libmysql/libmysql.c
---- mysql-dfsg-5.0-5.0.45.orig/libmysql/libmysql.c	2007-07-04 13:05:53.000000000 +0000
-+++ mysql-dfsg-5.0-5.0.45/libmysql/libmysql.c	2007-10-02 19:28:49.000000000 +0000
-@@ -3678,33 +3678,38 @@
-   case MYSQL_TYPE_FLOAT:
-   {
-     /*
--      We need to store data in the buffer before the truncation check to
-+      We need to mark the local variable volatile to
-       workaround Intel FPU executive precision feature.
-       (See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=323 for details)
--      AFAIU it does not guarantee to work.
-     */
--    float data;
-+    volatile float data;
-     if (is_unsigned)
-+    {
-       data= (float) ulonglong2double(value);
-+      *param->error= ((ulonglong) value) != ((ulonglong) data);
-+    }
-     else
--      data= (float) value;
-+    {
-+      data= (float)value;
-+      *param->error= value != ((longlong) data);
-+    }
-     floatstore(buffer, data);
--    *param->error= is_unsigned ?
--                   ((ulonglong) value) != ((ulonglong) (*(float*) buffer)) :
--                   ((longlong) value) != ((longlong) (*(float*) buffer));
-     break;
-   }
-   case MYSQL_TYPE_DOUBLE:
-   {
--    double data;
-+    volatile double data;
-     if (is_unsigned)
-+    {
-       data= ulonglong2double(value);
-+      *param->error= ((ulonglong) value) != ((ulonglong) data);
-+    }
-     else
-+    {
-       data= (double)value;
-+      *param->error= value != ((longlong) data);
-+    }
-     doublestore(buffer, data);
--    *param->error= is_unsigned ?
--                   ((ulonglong) value) != ((ulonglong) (*(double*) buffer)) :
--                   ((longlong) value) != ((longlong) (*(double*) buffer));
-     break;
-   }
-   case MYSQL_TYPE_TIME: