Auto-merge from mysql-trunk.

Alexander Nozdrin · Alexander Nozdrin · commit d05c63f721c8 · 2009-12-19T11:20:21.000+03:00
diff --git 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.

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