Auto-merge from mysql-trunk.

This commit is contained in:
Alexander Nozdrin 2009-12-19 11:20:21 +03:00
commit 8933c6f5f4

View File

@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM
#
# When changing major version number please also check switch statement
# in client/mysqlbinlog.cc:check_master_version().
AM_INIT_AUTOMAKE(mysql, 5.5.0-beta)
AM_INIT_AUTOMAKE(mysql, 5.5.1-m2)
AM_CONFIG_HEADER([include/config.h:config.h.in])
# Request support for automake silent-rules if available.