summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-04-30 16:39:00 +0300
committerGeorgi Kodinov <joro@sun.com>2009-04-30 16:39:00 +0300
commitabf3efe588e31f4905f3096cefc02915e06ef501 (patch)
treeb5252bce95666eb686bc76bf4da1221050a1cb93
parente5d859fab7e5973731b0816339b2a2714571487e (diff)
parent60083f4895b3c21cf24f311ea5d483a06e75b1f8 (diff)
downloadmariadb-git-abf3efe588e31f4905f3096cefc02915e06ef501.tar.gz
merged 5.0-main to 5.0-bugteam
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 9fdb1930cde..bd201aa9d26 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.0.80)
+AM_INIT_AUTOMAKE(mysql, 5.0.82)
AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=80
+NDB_VERSION_BUILD=82
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?