summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-06-26 11:43:00 +0400
committerAlexander Nozdrin <alik@sun.com>2010-06-26 11:43:00 +0400
commit93d6e7de9f95ad5329e952e7ee0b31f877ec3bc2 (patch)
tree9c6ede5ebc281053a067e509c919854b17c73831
parentc53cd1c0c9fd6395421870a1ed23dbdc27144f75 (diff)
parentf54b30426550007a361b2d935140c81ff6a0fef4 (diff)
downloadmariadb-git-93d6e7de9f95ad5329e952e7ee0b31f877ec3bc2.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 ad0b3f80bce..3467d2d852d 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,7 @@ dnl
dnl When changing the major version number please also check the switch
dnl statement in mysqlbinlog::check_master_version(). You may also need
dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.5.5-m3], [], [mysql])
+AC_INIT([MySQL Server], [5.5.6-m3], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM