[Pkg-mysql-commits] r1071 - in trunk/debian: . patches

Norbert Tretkowski nobse at alioth.debian.org
Wed Dec 12 20:16:02 UTC 2007


Author: nobse
Date: 2007-12-12 20:16:02 +0000 (Wed, 12 Dec 2007)
New Revision: 1071

Added:
   trunk/debian/patches/52_ndb-gcc-4.2.dpatch
   trunk/debian/patches/53_integer-gcc-4.2.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/00list
   trunk/debian/rules
Log:
Fix gcc 4.2.x related issues.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-12 19:28:41 UTC (rev 1070)
+++ trunk/debian/changelog	2007-12-12 20:16:02 UTC (rev 1071)
@@ -6,8 +6,7 @@
   * Update patches:
     + debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
     + debian/patches/89_ndb__staticlib.dpatch
-  * Build with gcc-4.1/g++-4.1, otherwise the (now enabled) testsuite
-    fails in ndb related tests.
+  * Run testsuite after build.
   * 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
@@ -16,14 +15,18 @@
     (closes: #436552)
   * Don't fail when upgrading mysql-common if $datadir is empty or not defined
     (patch from Edward Allcutt). (closes: #453127)
-  * New patch to fix mysqldump because 'null' is shown as type of fields for
-    view with bad definer. (closes: #454227)
-  * New patch (from 5.0.52) to fix mysqlcheck test result.
+  * New patch from 5.0.52 to fix mysqldump because 'null' is shown as type of
+    fields for view with bad definer. (closes: #454227)
+  * New patch from 5.0.52 to fix mysqlcheck test result.
+  * New patch from 5.0.52 to fix wrong optimization in ndb code when building
+    with gcc 4.2.x.
+  * New patch from 5.0.54 to fix wrong number output due to integer overflow
+    when building with gcc 4.2.x.
   * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
   * Add Vcs-* and Homepage fields to source stanza in control file.
   * Update mysqlreport to 3.2 release.
 
- -- Norbert Tretkowski <nobse at debian.org>  Wed, 12 Dec 2007 10:21:23 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 12 Dec 2007 19:39:34 +0100
 
 mysql-dfsg-5.0 (5.0.45-5) UNRELEASED; urgency=high
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2007-12-12 19:28:41 UTC (rev 1070)
+++ trunk/debian/control	2007-12-12 20:16:02 UTC (rev 1071)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian MySQL Maintainers <pkg-mysql-maint at lists.alioth.debian.org>
 Uploaders:  Christian Hammers <ch at debian.org>, Sean Finney <seanius at debian.org>, Adam Conrad <adconrad at 0c3.net>, Norbert Tretkowski <nobse at debian.org>
-Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison, gcc-4.1, g++-4.1
+Build-Depends: libtool (>= 1.4.2-7), procps | hurd,  debhelper (>= 4.1.16), file (>= 3.28-1), libncurses5-dev (>= 5.0-6), perl (>= 5.6.0), libwrap0-dev (>= 7.6-8.3), zlib1g-dev (>= 1:1.1.3-5), libreadline5-dev | libreadline-dev, psmisc, po-debconf, chrpath, automake1.9, doxygen, texlive-latex-base, gs, dpatch, gawk, bison
 Standards-Version: 3.7.2
 Homepage: http://dev.mysql.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-mysql/

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2007-12-12 19:28:41 UTC (rev 1070)
+++ trunk/debian/patches/00list	2007-12-12 20:16:02 UTC (rev 1071)
@@ -9,6 +9,8 @@
 45_warn-CLI-passwords.dpatch
 50_fix_mysqldump.dpatch
 51_mysqlcheck-result.dpatch
+52_ndb-gcc-4.2.dpatch
+53_integer-gcc-4.2.dpatch
 86_PATH_MAX.dpatch
 88_mctype_attrib.dpatch
 89_ndb__staticlib.dpatch

Added: trunk/debian/patches/52_ndb-gcc-4.2.dpatch
===================================================================
--- trunk/debian/patches/52_ndb-gcc-4.2.dpatch	                        (rev 0)
+++ trunk/debian/patches/52_ndb-gcc-4.2.dpatch	2007-12-12 20:16:02 UTC (rev 1071)
@@ -0,0 +1,153 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 52_ndb-gcc-4.2.dpatch by  <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- 1.8/ndb/include/kernel/AttributeHeader.hpp	2007-10-23 16:46:03 +02:00
++++ 1.9/ndb/include/kernel/AttributeHeader.hpp	2007-10-23 16:46:03 +02:00
+@@ -41,8 +41,7 @@ public:
+   STATIC_CONST( FRAGMENT_MEMORY= 0xFFF9 );
+ 
+   /** Initialize AttributeHeader at location aHeaderPtr */
+-  static AttributeHeader& init(void* aHeaderPtr, Uint32 anAttributeId, 
+-			       Uint32 aDataSize);
++  static void init(Uint32* aHeaderPtr, Uint32 anAttributeId, Uint32 aDataSize);
+ 
+   /** Returns size of AttributeHeader (usually one or two words) */
+   Uint32 getHeaderSize() const; // In 32-bit words
+@@ -100,10 +99,11 @@ public:
+  */
+ 
+ inline
+-AttributeHeader& AttributeHeader::init(void* aHeaderPtr, Uint32 anAttributeId, 
+-				       Uint32 aDataSize)
++void AttributeHeader::init(Uint32* aHeaderPtr, Uint32 anAttributeId, 
++                           Uint32 aDataSize)
+ {
+-  return * new (aHeaderPtr) AttributeHeader(anAttributeId, aDataSize);
++  AttributeHeader ah(anAttributeId, aDataSize);
++  *aHeaderPtr = ah.m_value;
+ }
+ 
+ inline
+
+--- 1.25/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-10-23 16:46:03 +02:00
++++ 1.26/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2007-10-23 16:46:03 +02:00
+@@ -1577,8 +1577,8 @@ int Dbtup::interpreterNextLab(Signal* si
+ 	  Uint32 TdataForUpdate[3];
+ 	  Uint32 Tlen;
+ 
+-	  AttributeHeader& ah = AttributeHeader::init(&TdataForUpdate[0], 
+-						      TattrId, TattrNoOfWords);
++	  AttributeHeader ah(TattrId, TattrNoOfWords);
++          TdataForUpdate[0] = ah.m_value;
+ 	  TdataForUpdate[1] = TregMemBuffer[theRegister + 2];
+ 	  TdataForUpdate[2] = TregMemBuffer[theRegister + 3];
+ 	  Tlen = TattrNoOfWords + 1;
+@@ -1594,6 +1594,7 @@ int Dbtup::interpreterNextLab(Signal* si
+ 		// Write a NULL value into the attribute
+ 		/* --------------------------------------------------------- */
+ 		ah.setNULL();
++                TdataForUpdate[0] = ah.m_value;
+ 		Tlen = 1;
+ 	      }//if
+ 	      int TnoDataRW= updateAttributes(pagePtr,
+
+--- 1.20/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-10-23 16:46:03 +02:00
++++ 1.21/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2007-10-23 16:46:03 +02:00
+@@ -676,8 +676,6 @@ bool
+ Dbtup::checkUpdateOfPrimaryKey(Uint32* updateBuffer, Tablerec* const regTabPtr)
+ {
+   Uint32 keyReadBuffer[MAX_KEY_SIZE_IN_WORDS];
+-  Uint32 attributeHeader;
+-  AttributeHeader* ahOut = (AttributeHeader*)&attributeHeader;
+   AttributeHeader ahIn(*updateBuffer);
+   Uint32 attributeId = ahIn.getAttributeId();
+   Uint32 attrDescriptorIndex = regTabPtr->tabDescriptor + (attributeId << ZAD_LOG_SIZE);
+@@ -700,16 +698,17 @@ Dbtup::checkUpdateOfPrimaryKey(Uint32* u
+ 
+   ReadFunction f = regTabPtr->readFunctionArray[attributeId];
+ 
+-  AttributeHeader::init(&attributeHeader, attributeId, 0);
++  AttributeHeader attributeHeader(attributeId, 0);
+   tOutBufIndex = 0;
+   tMaxRead = MAX_KEY_SIZE_IN_WORDS;
+ 
+   bool tmp = tXfrmFlag;
+   tXfrmFlag = true;
+-  ndbrequire((this->*f)(&keyReadBuffer[0], ahOut, attrDescriptor, attributeOffset));
++  ndbrequire((this->*f)(&keyReadBuffer[0], &attributeHeader, attrDescriptor,
++                        attributeOffset));
+   tXfrmFlag = tmp;
+-  ndbrequire(tOutBufIndex == ahOut->getDataSize());
+-  if (ahIn.getDataSize() != ahOut->getDataSize()) {
++  ndbrequire(tOutBufIndex == attributeHeader.getDataSize());
++  if (ahIn.getDataSize() != attributeHeader.getDataSize()) {
+     ljam();
+     return true;
+   }//if
+
+--- 1.13/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2007-10-23 16:46:03 +02:00
++++ 1.14/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2007-10-23 16:46:03 +02:00
+@@ -1168,9 +1168,7 @@ DbUtil::prepareOperation(Signal* signal,
+     /**************************************************************
+      * Attribute found - store in mapping  (AttributeId, Position)
+      **************************************************************/
+-    AttributeHeader & attrMap = 
+-      AttributeHeader::init(attrMappingIt.data, 
+-			    attrDesc.AttributeId,    // 1. Store AttrId
++    AttributeHeader attrMap(attrDesc.AttributeId,    // 1. Store AttrId
+ 			    0);
+     
+     if (attrDesc.AttributeKeyFlag) {
+@@ -1199,6 +1197,7 @@ DbUtil::prepareOperation(Signal* signal,
+ 	return;
+       }
+     }
++    *(attrMappingIt.data) = attrMap.m_value;
+ #if 0
+     ndbout << "BEFORE: attrLength: " << attrLength << endl;
+ #endif
+
+--- 1.24/ndb/src/ndbapi/NdbOperationDefine.cpp	2007-10-23 16:46:03 +02:00
++++ 1.25/ndb/src/ndbapi/NdbOperationDefine.cpp	2007-10-23 16:46:03 +02:00
+@@ -392,9 +392,8 @@ NdbOperation::getValue_impl(const NdbCol
+ 	return NULL;
+       }//if
+     }//if
+-    Uint32 ah;
+-    AttributeHeader::init(&ah, tAttrInfo->m_attrId, 0);
+-    if (insertATTRINFO(ah) != -1) {	
++    AttributeHeader ah(tAttrInfo->m_attrId, 0);
++    if (insertATTRINFO(ah.m_value) != -1) {	
+       // Insert Attribute Id into ATTRINFO part. 
+       
+       /************************************************************************
+@@ -525,12 +524,11 @@ NdbOperation::setValue( const NdbColumnI
+   
+   tAttrId = tAttrInfo->m_attrId;
+   const char *aValue = aValuePassed; 
+-  Uint32 ahValue;
+   if (aValue == NULL) {
+     if (tAttrInfo->m_nullable) {
+-      AttributeHeader& ah = AttributeHeader::init(&ahValue, tAttrId, 0);
++      AttributeHeader ah(tAttrId, 0);
+       ah.setNULL();
+-      insertATTRINFO(ahValue);
++      insertATTRINFO(ah.m_value);
+       // Insert Attribute Id with the value
+       // NULL into ATTRINFO part. 
+       DBUG_RETURN(0);
+@@ -563,8 +561,8 @@ NdbOperation::setValue( const NdbColumnI
+   }//if
+   const Uint32 totalSizeInWords = (sizeInBytes + 3)/4; // Including bits in last word
+   const Uint32 sizeInWords = sizeInBytes / 4;          // Excluding bits in last word
+-  (void) AttributeHeader::init(&ahValue, tAttrId, totalSizeInWords);
+-  insertATTRINFO( ahValue );
++  AttributeHeader ah(tAttrId, totalSizeInWords);
++  insertATTRINFO( ah.m_value );
+ 
+   /***********************************************************************
+    * Check if the pointer of the value passed is aligned on a 4 byte boundary.

Added: trunk/debian/patches/53_integer-gcc-4.2.dpatch
===================================================================
--- trunk/debian/patches/53_integer-gcc-4.2.dpatch	                        (rev 0)
+++ trunk/debian/patches/53_integer-gcc-4.2.dpatch	2007-12-12 20:16:02 UTC (rev 1071)
@@ -0,0 +1,303 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_integer-gcc-4.2.dpatch by  <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- 1.9/strings/int2str.c	2007-10-24 09:26:32 +02:00
++++ 1.10/strings/int2str.c	2007-10-24 09:26:32 +02:00
+@@ -57,6 +57,7 @@ int2str(register long int val, register 
+   register char *p;
+   long int new_val;
+   char *dig_vec= upcase ? _dig_vec_upper : _dig_vec_lower;
++  ulong uval= (ulong) val;
+ 
+   if (radix < 0)
+   {
+@@ -65,7 +66,8 @@ int2str(register long int val, register 
+     if (val < 0)
+     {
+       *dst++ = '-';
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (ulong)0 - uval;
+     }
+     radix = -radix;
+   }
+@@ -86,8 +88,8 @@ int2str(register long int val, register 
+   */
+   p = &buffer[sizeof(buffer)-1];
+   *p = '\0';
+-  new_val=(ulong) val / (ulong) radix;
+-  *--p = dig_vec[(uchar) ((ulong) val- (ulong) new_val*(ulong) radix)];
++  new_val= uval / (ulong) radix;
++  *--p = dig_vec[(uchar) (uval- (ulong) new_val*(ulong) radix)];
+   val = new_val;
+ #ifdef HAVE_LDIV
+   while (val != 0)
+@@ -133,20 +135,22 @@ char *int10_to_str(long int val,char *ds
+   char buffer[65];
+   register char *p;
+   long int new_val;
++  unsigned long int uval = (unsigned long int) val;
+ 
+   if (radix < 0)				/* -10 */
+   {
+     if (val < 0)
+     {
+       *dst++ = '-';
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (unsigned long int)0 - uval;
+     }
+   }
+ 
+   p = &buffer[sizeof(buffer)-1];
+   *p = '\0';
+-  new_val= (long) ((unsigned long int) val / 10);
+-  *--p = '0'+ (char) ((unsigned long int) val - (unsigned long) new_val * 10);
++  new_val= (long) (uval / 10);
++  *--p = '0'+ (char) (uval - (unsigned long) new_val * 10);
+   val = new_val;
+ 
+   while (val != 0)
+
+--- 1.9/strings/longlong2str.c	2007-10-24 09:26:32 +02:00
++++ 1.10/strings/longlong2str.c	2007-10-24 09:26:32 +02:00
+@@ -51,13 +51,15 @@ char *longlong2str(longlong val,char *ds
+   char buffer[65];
+   register char *p;
+   long long_val;
++  ulonglong uval= (ulonglong) val;
+ 
+   if (radix < 0)
+   {
+     if (radix < -36 || radix > -2) return (char*) 0;
+     if (val < 0) {
+       *dst++ = '-';
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (ulonglong)0 - uval;
+     }
+     radix = -radix;
+   }
+@@ -65,7 +67,7 @@ char *longlong2str(longlong val,char *ds
+   {
+     if (radix > 36 || radix < 2) return (char*) 0;
+   }
+-  if (val == 0)
++  if (uval == 0)
+   {
+     *dst++='0';
+     *dst='\0';
+@@ -74,14 +76,14 @@ char *longlong2str(longlong val,char *ds
+   p = &buffer[sizeof(buffer)-1];
+   *p = '\0';
+ 
+-  while ((ulonglong) val > (ulonglong) LONG_MAX)
++  while (uval > (ulonglong) LONG_MAX)
+   {
+-    ulonglong quo=(ulonglong) val/(uint) radix;
+-    uint rem= (uint) (val- quo* (uint) radix);
++    ulonglong quo= uval/(uint) radix;
++    uint rem= (uint) (uval- quo* (uint) radix);
+     *--p = _dig_vec_upper[rem];
+-    val= quo;
++    uval= quo;
+   }
+-  long_val= (long) val;
++  long_val= (long) uval;
+   while (long_val != 0)
+   {
+     long quo= long_val/radix;
+@@ -100,17 +102,19 @@ char *longlong10_to_str(longlong val,cha
+   char buffer[65];
+   register char *p;
+   long long_val;
++  ulonglong uval= (ulonglong) val;
+ 
+   if (radix < 0)
+   {
+     if (val < 0)
+     {
+       *dst++ = '-';
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (ulonglong)0 - uval;
+     }
+   }
+ 
+-  if (val == 0)
++  if (uval == 0)
+   {
+     *dst++='0';
+     *dst='\0';
+@@ -119,14 +123,14 @@ char *longlong10_to_str(longlong val,cha
+   p = &buffer[sizeof(buffer)-1];
+   *p = '\0';
+ 
+-  while ((ulonglong) val > (ulonglong) LONG_MAX)
++  while (uval > (ulonglong) LONG_MAX)
+   {
+-    ulonglong quo=(ulonglong) val/(uint) 10;
+-    uint rem= (uint) (val- quo* (uint) 10);
++    ulonglong quo= uval/(uint) 10;
++    uint rem= (uint) (uval- quo* (uint) 10);
+     *--p = _dig_vec_upper[rem];
+-    val= quo;
++    uval= quo;
+   }
+-  long_val= (long) val;
++  long_val= (long) uval;
+   while (long_val != 0)
+   {
+     long quo= long_val/10;
+
+--- 1.65/strings/ctype-ucs2.c	2007-10-24 09:26:32 +02:00
++++ 1.66/strings/ctype-ucs2.c	2007-10-24 09:26:32 +02:00
+@@ -1018,6 +1018,7 @@ int my_l10tostr_ucs2(CHARSET_INFO *cs,
+   register char *p, *db, *de;
+   long int new_val;
+   int  sl=0;
++  unsigned long int uval = (unsigned long int) val;
+   
+   p = &buffer[sizeof(buffer)-1];
+   *p='\0';
+@@ -1027,12 +1028,13 @@ int my_l10tostr_ucs2(CHARSET_INFO *cs,
+     if (val < 0)
+     {
+       sl   = 1;
+-      val  = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval  = (unsigned long int)0 - uval;
+     }
+   }
+   
+-  new_val = (long) ((unsigned long int) val / 10);
+-  *--p    = '0'+ (char) ((unsigned long int) val - (unsigned long) new_val * 10);
++  new_val = (long) (uval / 10);
++  *--p    = '0'+ (char) (uval - (unsigned long) new_val * 10);
+   val     = new_val;
+   
+   while (val != 0)
+@@ -1065,34 +1067,36 @@ int my_ll10tostr_ucs2(CHARSET_INFO *cs _
+   register char *p, *db, *de;
+   long long_val;
+   int  sl=0;
++  ulonglong uval= (ulonglong) val;
+   
+   if (radix < 0)
+   {
+     if (val < 0)
+     {
+       sl=1;
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (ulonglong)0 - uval;
+     }
+   }
+   
+   p = &buffer[sizeof(buffer)-1];
+   *p='\0';
+   
+-  if (val == 0)
++  if (uval == 0)
+   {
+     *--p='0';
+     goto cnv;
+   }
+   
+-  while ((ulonglong) val > (ulonglong) LONG_MAX)
++  while (uval > (ulonglong) LONG_MAX)
+   {
+-    ulonglong quo=(ulonglong) val/(uint) 10;
+-    uint rem= (uint) (val- quo* (uint) 10);
++    ulonglong quo= uval/(uint) 10;
++    uint rem= (uint) (uval- quo* (uint) 10);
+     *--p = '0' + rem;
+-    val= quo;
++    uval= quo;
+   }
+   
+-  long_val= (long) val;
++  long_val= (long) uval;
+   while (long_val != 0)
+   {
+     long quo= long_val/10;
+
+--- 1.82/strings/ctype-simple.c	2007-10-24 09:26:32 +02:00
++++ 1.83/strings/ctype-simple.c	2007-10-24 09:26:32 +02:00
+@@ -837,6 +837,7 @@ int my_long10_to_str_8bit(CHARSET_INFO *
+   register char *p, *e;
+   long int new_val;
+   uint sign=0;
++  unsigned long int uval = (unsigned long int) val;
+ 
+   e = p = &buffer[sizeof(buffer)-1];
+   *p= 0;
+@@ -845,15 +846,16 @@ int my_long10_to_str_8bit(CHARSET_INFO *
+   {
+     if (val < 0)
+     {
+-      val= -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval= (unsigned long int)0 - uval;
+       *dst++= '-';
+       len--;
+       sign= 1;
+     }
+   }
+   
+-  new_val = (long) ((unsigned long int) val / 10);
+-  *--p    = '0'+ (char) ((unsigned long int) val - (unsigned long) new_val * 10);
++  new_val = (long) (uval / 10);
++  *--p    = '0'+ (char) (uval - (unsigned long) new_val * 10);
+   val     = new_val;
+   
+   while (val != 0)
+@@ -876,12 +878,14 @@ int my_longlong10_to_str_8bit(CHARSET_IN
+   register char *p, *e;
+   long long_val;
+   uint sign= 0;
++  ulonglong uval = (ulonglong)val;
+   
+   if (radix < 0)
+   {
+     if (val < 0)
+     {
+-      val = -val;
++      /* Avoid integer overflow in (-val) for LONGLONG_MIN (BUG#31799). */
++      uval = (ulonglong)0 - uval;
+       *dst++= '-';
+       len--;
+       sign= 1;
+@@ -891,22 +895,22 @@ int my_longlong10_to_str_8bit(CHARSET_IN
+   e = p = &buffer[sizeof(buffer)-1];
+   *p= 0;
+   
+-  if (val == 0)
++  if (uval == 0)
+   {
+     *--p= '0';
+     len= 1;
+     goto cnv;
+   }
+   
+-  while ((ulonglong) val > (ulonglong) LONG_MAX)
++  while (uval > (ulonglong) LONG_MAX)
+   {
+-    ulonglong quo=(ulonglong) val/(uint) 10;
+-    uint rem= (uint) (val- quo* (uint) 10);
++    ulonglong quo= uval/(uint) 10;
++    uint rem= (uint) (uval- quo* (uint) 10);
+     *--p = '0' + rem;
+-    val= quo;
++    uval= quo;
+   }
+   
+-  long_val= (long) val;
++  long_val= (long) uval;
+   while (long_val != 0)
+   {
+     long quo= long_val/10;

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-12 19:28:41 UTC (rev 1070)
+++ trunk/debian/rules	2007-12-12 20:16:02 UTC (rev 1071)
@@ -47,9 +47,9 @@
 endif
 
 	sh -c  'PATH=$${MYSQL_BUILD_PATH:-"/bin:/usr/bin"} \
-	    	CC=gcc-4.1 \
+		CC=$${MYSQL_BUILD_CC:-gcc} \
 	    	CFLAGS=$${MYSQL_BUILD_CFLAGS:-"-DBIG_JOINS=1 -O2"} \
-	    	CXX=g++-4.1 \
+		CXX=$${MYSQL_BUILD_CXX:-g++} \
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-DBIG_JOINS=1 -felide-constructors -fno-rtti -O2"} \
 	    ./configure \
 		--build=${DEB_BUILD_GNU_TYPE} \




More information about the Pkg-mysql-commits mailing list