Commit 903e4040 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-4.1

parents 21ca7e7c 7f0667c6
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ MV="mv"
STRIP=1
DEBUG=0
SILENT=0
MACHINE=
TMP=/tmp
SUFFIX=""
NDBCLUSTER=
@@ -26,6 +27,7 @@ parse_arguments() {
      --tmp=*)    TMP=`echo "$arg" | sed -e "s;--tmp=;;"` ;;
      --suffix=*) SUFFIX=`echo "$arg" | sed -e "s;--suffix=;;"` ;;
      --no-strip) STRIP=0 ;;
      --machine=*)  MACHINE=`echo "$arg" | sed -e "s;--machine=;;"` ;;
      --silent)   SILENT=1 ;;
      --with-ndbcluster) NDBCLUSTER=1 ;;
      *)
@@ -286,8 +288,17 @@ if [ x$NDBCLUSTER = x1 ]; then
  rm -rf $BASE/ndb-stage
fi

# Use the override --machine if present
if [ -n "$MACHINE" ] ; then
  machine=$MACHINE
fi

# Change the distribution to a long descriptive name
NEW_NAME=mysql@MYSQL_SERVER_SUFFIX@-$version-$system-$machine$SUFFIX

# Print the platform name for build logs
echo "PLATFORM NAME: $system-$machine"

BASE2=$TMP/$NEW_NAME
rm -r -f $BASE2
mv $BASE $BASE2