summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorunknown <kent@mysql.com/kent-amd64.(none)>2008-02-12 19:08:04 +0100
committerunknown <kent@mysql.com/kent-amd64.(none)>2008-02-12 19:08:04 +0100
commit844b3ba395dcfad43f80737641c1142a9a92e4af (patch)
tree2095141533136990de752f03625c4a94c483ef65 /config
parentdf2cf8c78dc022472dd22584a140f579ad8cfe03 (diff)
downloadmariadb-git-844b3ba395dcfad43f80737641c1142a9a92e4af.tar.gz
ha_ndbcluster.m4:
If the third number in version is followed by a letter, include it in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD config/ac-macros/ha_ndbcluster.m4: If the third number in version is followed by a letter, include it in NDB_VERSION_STATUS, but not in numeric NDB_VERSION_BUILD
Diffstat (limited to 'config')
-rw-r--r--config/ac-macros/ha_ndbcluster.m413
1 files changed, 4 insertions, 9 deletions
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 60ca92abc10..9ea2e9972f7 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -2,15 +2,10 @@ dnl ---------------------------------------------------------------------------
dnl Macro: MYSQL_CHECK_NDBCLUSTER
dnl ---------------------------------------------------------------------------
-NDB_VERSION_MAJOR=`echo $VERSION | cut -d. -f1`
-NDB_VERSION_MINOR=`echo $VERSION | cut -d. -f2`
-NDB_VERSION_BUILD=`echo $VERSION | cut -d. -f3 | cut -d- -f1`
-NDB_VERSION_STATUS=`echo $VERSION | cut -d- -f2`
-# if there was now -suffix, $NDB_VERSION_STATUS will be the same as $VERSION
-if test "$NDB_VERSION_STATUS" = "$VERSION"
-then
- NDB_VERSION_STATUS=""
-fi
+NDB_VERSION_MAJOR=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f1`
+NDB_VERSION_MINOR=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f2`
+NDB_VERSION_BUILD=`echo $MYSQL_NO_DASH_VERSION | cut -d. -f3`
+NDB_VERSION_STATUS=`echo $VERSION | sed 's/^[[-.0-9]]*//'`
TEST_NDBCLUSTER=""
dnl for build ndb docs