diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-12-05 18:52:58 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-12-05 18:52:58 +0100 |
| commit | 439e4aff43f419ac81b19c93dc24bdb2579c7652 (patch) | |
| tree | 48d33429c793f8ac076875e69964863651141489 /configure.in | |
| parent | 40762f91b5218b238f0b19316db7939e2194e5b0 (diff) | |
| parent | 9282ad20d29eaf48dc1ad3c1483710382f5e3d89 (diff) | |
| download | mariadb-git-439e4aff43f419ac81b19c93dc24bdb2579c7652.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/parser.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sp_gis.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/parser.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto 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 3555e453ef3..2155676caac 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.1.14-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.15-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 |