diff options
author | unknown <pem@mysql.com> | 2003-01-09 17:56:57 +0100 |
---|---|---|
committer | unknown <pem@mysql.com> | 2003-01-09 17:56:57 +0100 |
commit | b09fe58c63a0ee2e68c82f18be452d844cdc642f (patch) | |
tree | d30f557e6920ffb8c9034d2cb484daff205a41ff /configure.in | |
parent | ac2aea8c4a36175e844bbc884dfd5d38167cf181 (diff) | |
parent | a3fe4223e89ea4e5857005181367faccf2c7bed6 (diff) | |
download | mariadb-git-b09fe58c63a0ee2e68c82f18be452d844cdc642f.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.cc:
SCCS merged
sql/item.h:
SCCS merged
sql/lex.h:
SCCS merged
sql/sql_lex.cc:
SCCS merged
sql/sql_lex.h:
SCCS merged
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index f2e64ddffe4..c93394c1751 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 4.1.0-alpha) +AM_INIT_AUTOMAKE(mysql, 5.0.0-alpha) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 |