diff options
| author | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
|---|---|---|
| committer | unknown <stewart@mysql.com> | 2005-12-28 13:55:59 +1100 |
| commit | 94cbe6fd293eac2eed1bfd48a31a0498dcb11406 (patch) | |
| tree | 720547939e4403e5a08c0131165d304b2444ea79 /configure.in | |
| parent | 581750330bf6c0777db9e7dfd71c0c5b99a27b28 (diff) | |
| parent | 6706115c0a6db47ea5e640f4f03ca775c3cfda04 (diff) | |
| download | mariadb-git-94cbe6fd293eac2eed1bfd48a31a0498dcb11406.tar.gz | |
Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into mysql.com:/home/stewart/Documents/MySQL/5.1/new
client/mysqltest.c:
Auto merged
sql/item.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
strings/decimal.c:
Auto merged
configure.in:
remove 5.0 version increement
sql/ha_archive.cc:
merge
sql/handler.cc:
merge
sql/mysqld.cc:
merge
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.in b/configure.in index 10c3c26ec26..ba213c2484d 100644 --- a/configure.in +++ b/configure.in @@ -6,6 +6,7 @@ AC_PREREQ(2.52)dnl Minimum Autoconf version required. 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.1.5-alpha) AM_CONFIG_HEADER(config.h) @@ -17,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=18 +NDB_VERSION_BUILD=19 NDB_VERSION_STATUS="" # Set all version vars based on $VERSION. How do we do this more elegant ? |