mirror of
https://github.com/MariaDB/server.git
synced 2026-05-10 00:54:30 +02:00
merge of mysql-5.5 into mysql-5.5-wl1054
This commit is contained in:
commit
dc0b8f7ada
503 changed files with 25314 additions and 6960 deletions
|
|
@ -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.6-m3], [], [mysql])
|
||||
AC_INIT([MySQL Server], [5.5.7-rc], [], [mysql])
|
||||
|
||||
AC_CONFIG_SRCDIR([sql/mysqld.cc])
|
||||
AC_CANONICAL_SYSTEM
|
||||
|
|
@ -2605,7 +2605,7 @@ MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
|
|||
|
||||
dnl -- ndbcluster requires partition to be enabled
|
||||
|
||||
MYSQL_CONFIGURE_PLUGINS([none])
|
||||
MYSQL_CONFIGURE_PLUGINS([default])
|
||||
|
||||
# Only build client code?
|
||||
AC_ARG_WITH(server,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue