Commit c209b839 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M41/mysql-4.1 

into  trift2.:/MySQL/M41/push-4.1
parents 618e2aca 2536f331

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,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, 4.1.24)

AM_INIT_AUTOMAKE(mysql, 4.1.25)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -21,7 +21,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=24

NDB_VERSION_BUILD=25

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?