diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-12-10 12:02:02 +0100 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-12-10 12:02:02 +0100 |
| commit | 9e5ed26076c1999f4437eca4a7ef133962f2e30f (patch) | |
| tree | a92ff04631e954925471dbdbc11186eab56b0474 /configure.in | |
| parent | afc9d4bbddc5ea82b7611d8f5deff88251fe83d7 (diff) | |
| parent | 3308d8794eec865679e9d282b6ae3a662d7d212a (diff) | |
| download | mariadb-git-9e5ed26076c1999f4437eca4a7ef133962f2e30f.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
configure.in:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index ead2f85afb7..52fe0dc9c66 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.54) +AM_INIT_AUTOMAKE(mysql, 5.0.52) 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=54 +NDB_VERSION_BUILD=52 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? |