diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-08 11:40:33 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-08 11:40:33 +0100 |
| commit | 4a3d61435219d46a59efee5aa7f0a16d5e725278 (patch) | |
| tree | 2a056a53c2de4eab8d7779683107bb22158730d8 /configure.in | |
| parent | 379a034ba1f7b0d7489a31c040b37724cd56c31d (diff) | |
| parent | 4acc08c522a6dd5f3ccce4f2f715c550af9b7e83 (diff) | |
| download | mariadb-git-4a3d61435219d46a59efee5aa7f0a16d5e725278.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
configure.in:
Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
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 8dffddbeb30..d0c2cd87381 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.29) +AM_INIT_AUTOMAKE(mysql, 5.0.30) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=29 +NDB_VERSION_BUILD=30 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? |