Auto-merge from mysql-trunk.

d05c63f7 · Alexander Nozdrin · e6f0b154 · 57c69db9 · d05c63f7
Commit d05c63f7 authored Dec 19, 2009 by Alexander Nozdrin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

configure.in configure.in +1 -1

No files found.
--- a/configure.in
+++ b/configure.in
@@ -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.