Auto-merge from 5.1-bugteam

This commit is contained in:
Davi Arnaut 2009-01-15 07:52:06 -02:00
commit ed87b43915

View File

@ -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.76)
AM_INIT_AUTOMAKE(mysql, 5.0.77)
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=76
NDB_VERSION_BUILD=77
NDB_VERSION_STATUS=""
# Set all version vars based on $VERSION. How do we do this more elegant ?