diff options
| author | unknown <pem@mysql.com> | 2002-11-19 18:41:47 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2002-11-19 18:41:47 +0100 |
| commit | 558eea5c4d463207c408f0a23edf75dcdc7fcf5a (patch) | |
| tree | bd8ef6512a497ac58c5e73ab64c383bff3db5c13 /configure.in | |
| parent | 2f639e57a4b1ac24c72b4e788e160d4a8930cfde (diff) | |
| parent | b76c803ab9a655b98c4cc561709c7e61b33f98e5 (diff) | |
| download | mariadb-git-558eea5c4d463207c408f0a23edf75dcdc7fcf5a.tar.gz | |
Merged 4.1 into 5.0.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~98ee606e6b0fe965:
'Auto converge rename'
configure.in:
Auto merged
sql/sql_yacc.yy:
Manually 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 5de157a49c9..7c5654e25c9 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 |