From: Date: June 27 2008 7:41pm
Subject: bzr push into mysql-5.1 branch (joerg:2660 to 2661) Bug#35658, Bug#37623
List-Archive: http://lists.mysql.com/commits/48669
X-Bug: 35658
Message-Id: <20080627174123.4A2A23B3CA@trift-lap.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2661 Joerg Bruehe	2008-06-27 [merge]
      Merge the fix for bug#37623  (Suffix "-64bit" is duplicated)
      from 5.0 into the 5.1.26 release clone.
modified:
  scripts/make_binary_distribution.sh

 2660 Gleb Shchepa	2008-06-27
      buckport to 5.1.26 from 6.0
      
      Bug#35658 (An empty binary value leads to mysqld crash)
        
      Before this fix, the following token
        b''
      caused the parser to crash when reading the binary value from the empty string.
      The crash was caused by:
        ptr+= max_length - 1;
      because max_length is unsigned and was 0, causing an overflow.
        
      With this fix, an empty binary literal b'' is parsed as a binary value 0,
      in Item_bin_string.
modified:
  mysql-test/r/varbinary.result
  mysql-test/t/varbinary.test
  sql/item.cc

=== modified file 'scripts/make_binary_distribution.sh'
--- a/scripts/make_binary_distribution.sh	2008-06-18 01:04:10 +0000
+++ b/scripts/make_binary_distribution.sh	2008-06-27 17:36:45 +0000
@@ -92,6 +92,7 @@ if [ x"$PLATFORM" = x"" ] ; then
   system=`echo $system | sed -e 's/darwin6.*/osx10.2/g'`
   system=`echo $system | sed -e 's/darwin7.*/osx10.3/g'`
   system=`echo $system | sed -e 's/darwin8.*/osx10.4/g'`
+  system=`echo $system | sed -e 's/darwin9.*/osx10.5/g'`
   system=`echo $system | sed -e 's/\(aix4.3\).*/\1/g'`
   system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`
   system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`