summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-15 13:22:26 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-15 13:22:26 +0300
commitf007796bf4d4dff6353145a3cf2dff57e3819b20 (patch)
tree98c0a89e46a556c957b34c7835d17f875e22dcb5
parentf6d13ea3e374f6a99d416e987ef5d750169c1656 (diff)
parenta3bc225ecf757c866e9406a28e5b88ab22f57e6b (diff)
downloadmariadb-git-f007796bf4d4dff6353145a3cf2dff57e3819b20.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 0a040cc60ee..32acbfd3dad 100644
--- a/configure.in
+++ b/configure.in
@@ -27,7 +27,7 @@ AC_PREREQ(2.59)
# Remember to also update version.c in ndb.
# When changing major version number please also check switch statement
# in client/mysqlbinlog.cc:check_master_version().
-AC_INIT([MySQL Server], [5.5.3-m3], [], [mysql])
+AC_INIT([MySQL Server], [5.5.4-m3], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM
# USTAR format gives us the possibility to store longer path names in