mirror of
https://github.com/MariaDB/server.git
synced 2025-10-24 07:13:33 +03:00
Bug #55547 InnoDB is not included when configuring by default
Added InnoDB to the 'default' plugin group, and modified
the autoconf script so the 'default' group is actually
built by default.
(i.e ./configure.am == ./configure.am --with-plugins=default ,
instead of being ./configure.am --with-plugins=none )
This commit is contained in:
@@ -782,7 +782,7 @@ dnl Emits shell script for checking configure arguments
|
|||||||
dnl Arguments to this macro is default value for selected plugins
|
dnl Arguments to this macro is default value for selected plugins
|
||||||
|
|
||||||
AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
|
AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
|
||||||
__MYSQL_CHECK_PLUGIN_ARGS(m4_default([$1], [none]))
|
__MYSQL_CHECK_PLUGIN_ARGS(m4_default([$1], [default]))
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([__MYSQL_CHECK_PLUGIN_ARGS],[
|
AC_DEFUN([__MYSQL_CHECK_PLUGIN_ARGS],[
|
||||||
|
|||||||
@@ -2606,7 +2606,7 @@ MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support],
|
|||||||
|
|
||||||
dnl -- ndbcluster requires partition to be enabled
|
dnl -- ndbcluster requires partition to be enabled
|
||||||
|
|
||||||
MYSQL_CONFIGURE_PLUGINS([none])
|
MYSQL_CONFIGURE_PLUGINS([default])
|
||||||
|
|
||||||
# Only build client code?
|
# Only build client code?
|
||||||
AC_ARG_WITH(server,
|
AC_ARG_WITH(server,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
|
MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
|
||||||
[Transactional Tables using InnoDB], [max,max-no-ndb])
|
[Transactional Tables using InnoDB], [default,max,max-no-ndb])
|
||||||
MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
|
MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
|
||||||
MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])
|
MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])
|
||||||
MYSQL_PLUGIN_DYNAMIC(innobase, [ha_innodb.la])
|
MYSQL_PLUGIN_DYNAMIC(innobase, [ha_innodb.la])
|
||||||
|
|||||||
Reference in New Issue
Block a user