Commit b1dab204 authored by Alexander Nozdrin's avatar Alexander Nozdrin

Merge from mysql-trunk.

parents c7d94558 f9a8fa19
...@@ -27,7 +27,7 @@ AC_PREREQ(2.59) ...@@ -27,7 +27,7 @@ AC_PREREQ(2.59)
# Remember to also update version.c in ndb. # Remember to also update version.c in ndb.
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in client/mysqlbinlog.cc:check_master_version(). # in client/mysqlbinlog.cc:check_master_version().
AC_INIT([MySQL Server], [5.5.99-m3], [], [mysql]) AC_INIT([MySQL Server], [5.6.99-m4], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# USTAR format gives us the possibility to store longer path names in # USTAR format gives us the possibility to store longer path names in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment