From: Date: April 11 2007 1:02pm
Subject: bk commit into 5.0 tree (df:1.2418)
List-Archive: http://lists.mysql.com/commits/24267
Message-Id: <200704111104.l3BB4GeW027082@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-11 13:02:03+02:00, df@stripped +1 -0
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.36-sp
  MERGE: 1.2414.1.1

  configure.in@stripped, 2007-04-11 13:02:01+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.426.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.0.36-sp/RESYNC

--- 1.427/configure.in	2007-04-11 11:03:33 +02:00
+++ 1.428/configure.in	2007-04-11 13:02:01 +02:00
@@ -30,7 +30,7 @@
 # Remember that regexps needs to quote [ and ] since this is run through m4
 MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|[[a-z]]*-.*$||"`
 MYSQL_BASE_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|\.[[^.]]*$||"`
-MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION. | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
+MYSQL_VERSION_ID=`echo $MYSQL_NO_DASH_VERSION | sed -e 's|[[^0-9.]].*$||;s|$|.|' | sed -e 's/[[^0-9.]]//g; s/\./  /g; s/ \([[0-9]]\) / 0\\1 /g; s/ //g'`
 
 # The port should be constant for a LONG time
 MYSQL_TCP_PORT_DEFAULT=3306