Commit cc2ae4e5 authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner2-5.0
parents ff994c32 233f6d99
......@@ -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.13-beta)
AM_INIT_AUTOMAKE(mysql, 5.0.14-rc)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
......@@ -18,8 +18,8 @@ SHARED_LIB_VERSION=15:0:0
# ndb version
NDB_VERSION_MAJOR=5
NDB_VERSION_MINOR=0
NDB_VERSION_BUILD=13
NDB_VERSION_STATUS="beta"
NDB_VERSION_BUILD=14
NDB_VERSION_STATUS="rc"
# Set all version vars based on $VERSION. How do we do this more elegant ?
# Remember that regexps needs to quote [ and ] since this is run through m4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment