Automerge (most) changes of the 5.5.6-rc release build to main 5.5.

This is not the final merge!
This commit is contained in:
Joerg Bruehe 2010-09-10 20:48:13 +02:00
commit f6bddff896
31 changed files with 388 additions and 48 deletions

View file

@ -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.7-m3], [], [mysql])
AC_INIT([MySQL Server], [5.5.7-rc], [], [mysql])
AC_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM