summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-04-11 13:37:05 +0200
committerunknown <df@pippilotta.erinye.com>2007-04-11 13:37:05 +0200
commitc6ada65a96f9e48cad0cdd5db7b2cea064de18e5 (patch)
tree4f9bb0f73d8a3b2c6c0cd185535b3fe757cc3a09 /configure.in
parent44adef74ece37f4fbe26a63adc29371e61a10213 (diff)
parentf89df01cc00bf612ffb0575fe0258a6b0769db1b (diff)
downloadmariadb-git-c6ada65a96f9e48cad0cdd5db7b2cea064de18e5.tar.gz
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.1-build-work configure.in: Auto merged
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 50ca08ab1ed..a46ba158d08 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# 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