diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2008-01-22 15:56:15 -0700 |
| commit | 6c26935035ce6fc646fc448dc181d9a3a870cd54 (patch) | |
| tree | 22de11d4d65b9eb7c56b5e80669f19cf9ff242f4 /configure.in | |
| parent | 74c9f82afb1d145636b91eff4b26131fd60e4f68 (diff) | |
| parent | 37ff91b3bfdb946743e36ddd13bfda71598f45a8 (diff) | |
| download | mariadb-git-6c26935035ce6fc646fc448dc181d9a3a870cd54.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_sum.cc:
Manual merge.
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 a63f8d6b44c..330f4e48453 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.23-rc) +AM_INIT_AUTOMAKE(mysql, 5.1.24-rc) AM_CONFIG_HEADER([include/config.h:config.h.in]) PROTOCOL_VERSION=10 |