summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-12-19 11:20:21 +0300
committerAlexander Nozdrin <alik@sun.com>2009-12-19 11:20:21 +0300
commit8933c6f5f431e06046a8c4f635ae2a366fbc8da8 (patch)
tree36f330f4a7835c1dcd6a2dcde163bc8949c4d222
parent53da51de9d8fc607063e131cc32361f39d95ac2d (diff)
parentd11111f1a694fdec2464f176fe0f0f95f9480d93 (diff)
downloadmariadb-git-8933c6f5f431e06046a8c4f635ae2a366fbc8da8.tar.gz
Auto-merge from mysql-trunk.
-rw-r--r--configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 5838201e0ad..a5b2c5c001a 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 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.