diff options
author | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:21:35 -0600 |
---|---|---|
committer | unknown <tsmith@siva.hindu.god> | 2007-05-17 14:21:35 -0600 |
commit | 5ad7fdfa954c3a82b6d293d25b3bc62012b548ca (patch) | |
tree | 10ace6766fed5baa02e072f80988abb4c8aca792 /configure.in | |
parent | 103f45b7a547f8f663f5508a7fa433d219af56a9 (diff) | |
parent | 7c472868af278cf5725d3a3f94c7f6c905386c06 (diff) | |
download | mariadb-git-5ad7fdfa954c3a82b6d293d25b3bc62012b548ca.tar.gz |
Merge siva.hindu.god:/home/tsmith/m/bk/51
into siva.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/outfile.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/my_decimal.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/structs.h:
Auto merged
storage/myisam/ha_myisam.cc:
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 ac5bab19c11..e3c6edb9b0f 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM # # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AM_INIT_AUTOMAKE(mysql, 5.1.18-beta) +AM_INIT_AUTOMAKE(mysql, 5.1.19-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 |