Commit 848611b5 authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents b40842f2 67312e3d

scripts/make_binary_distribution.sh

+16 −0
Original line number Diff line number Diff line
@@ -294,6 +294,22 @@ if [ x$NDBCLUSTER = x1 ]; then 
  rm -rf $BASE/ndb-stage

fi



# Remove vendor from $system

system=`echo $system | sed -e 's/[a-z]*-\(.*\)/\1/g'`



# Map OS names to "our" OS names (eg. darwin6.8 -> osx10.2)

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/\(aix4.3\).*/\1/g'`

system=`echo $system | sed -e 's/\(aix5.1\).*/\1/g'`

system=`echo $system | sed -e 's/\(aix5.2\).*/\1/g'`

system=`echo $system | sed -e 's/\(aix5.3\).*/\1/g'`

system=`echo $system | sed -e 's/osf5.1b/tru64/g'`

system=`echo $system | sed -e 's/linux-gnu/linux/g'`

system=`echo $system | sed -e 's/solaris2.\([0-9]*\)/solaris\1/g'`

system=`echo $system | sed -e 's/sco3.2v\(.*\)/openserver\1/g'`



# Change the distribution to a long descriptive name

NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX

BASE2=$TMP/$NEW_NAME