diff options
author | unknown <ingo@mysql.com> | 2005-12-07 19:47:55 +0100 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-12-07 19:47:55 +0100 |
commit | e2bf3b211b093161c3f4925c964d818ad3ae375f (patch) | |
tree | e8539b73dd37a08a46aab2d646d823736fa563aa /configure.in | |
parent | 02f90923cf51ad0df6c73b9348123bb8c54291ff (diff) | |
parent | 5213f5894a043b74f12d2be1a43e30de3d5e6b69 (diff) | |
download | mariadb-git-e2bf3b211b093161c3f4925c964d818ad3ae375f.tar.gz |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug10932
configure.in:
Auto merged
sql/mysql_priv.h:
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 38ce699a7c5..3b2dd289877 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.0.17) +AM_INIT_AUTOMAKE(mysql, 5.0.18) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 |