diff options
| author | unknown <tulin@build.mysql.com> | 2005-01-13 10:13:06 +0100 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2005-01-13 10:13:06 +0100 |
| commit | b3ca484e18704389ea9c2dfc38435ccedc72dd5e (patch) | |
| tree | 301815bbcf6f08994c4b12de1dd5437999b2851d /configure.in | |
| parent | d7c88110f147f67409b87dd71e4cd6cf2b30afec (diff) | |
| parent | 7bb2ab50fc91a03d2a2c5b4fd42729b905a2c828 (diff) | |
| download | mariadb-git-b3ca484e18704389ea9c2dfc38435ccedc72dd5e.tar.gz | |
Merge build.mysql.com:/users/tulin/mysql-5.0
into build.mysql.com:/users/tulin/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/sql_acl.cc:
Auto merged
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 198e2407541..ddb0fd745d7 100644 --- a/configure.in +++ b/configure.in @@ -5,8 +5,9 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM +# The Docs Makefile.am parses this line! # Don't forget to also update the NDB lines below. -AM_INIT_AUTOMAKE(mysql, 5.0.3-alpha) +AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 |