Commit f6f88353 authored by Sergei Golubchik's avatar Sergei Golubchik

use "default" plugin configuration by default, not "none".

enable maria in the default plugin configuration

config/ac-macros/plugins.m4:
  typo in comment fixed.
  change default plugin configuration to be "default" not "none".
  don't print default plugin configuration in the help text (as it's "default" anyway)
configure.in:
  use "default" plugin configuration by default, not "none"
storage/maria/plug.in:
  enable maria in the default plugin configuration
parent 06fd8990
...@@ -280,7 +280,7 @@ dnl --------------------------------------------------------------------------- ...@@ -280,7 +280,7 @@ dnl ---------------------------------------------------------------------------
dnl Macro: MYSQL_CONFIGURE_PLUGINS dnl Macro: MYSQL_CONFIGURE_PLUGINS
dnl dnl
dnl SYNOPSIS dnl SYNOPSIS
dnl MYSQL_PLUGIN_DEPENDS([name,name...]) dnl MYSQL_CONFIGURE_PLUGINS([name,name...])
dnl dnl
dnl DESCRIPTION dnl DESCRIPTION
dnl Used last, emits all required shell code to configure the plugins dnl Used last, emits all required shell code to configure the plugins
...@@ -735,13 +735,13 @@ dnl Emits shell script for checking configure arguments ...@@ -735,13 +735,13 @@ 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],[
AC_ARG_WITH([plugins], AC_ARG_WITH([plugins],
AS_HELP_STRING([--with-plugins=PLUGIN[[[[[,PLUGIN..]]]]]], AS_HELP_STRING([--with-plugins=PLUGIN[[[[[,PLUGIN..]]]]]],
[Plugins to include in mysqld. (default is: $1) Must be a [Plugins to include in mysqld. Must be a
configuration name or a comma separated list of plugins.]) configuration name or a comma separated list of plugins.])
AS_HELP_STRING([], AS_HELP_STRING([],
[Available configurations are:] dnl [Available configurations are:] dnl
......
...@@ -2387,7 +2387,7 @@ MYSQL_STORAGE_ENGINE(partition, partition, [Partition Support], ...@@ -2387,7 +2387,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,
......
MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine], MYSQL_STORAGE_ENGINE(maria,, [Maria Storage Engine],
[Crash-safe tables with MyISAM heritage], [max,max-no-ndb]) [Crash-safe tables with MyISAM heritage], [default,max,max-no-ndb])
MYSQL_PLUGIN_DIRECTORY(maria, [storage/maria]) MYSQL_PLUGIN_DIRECTORY(maria, [storage/maria])
MYSQL_PLUGIN_STATIC(maria, [libmaria.a]) MYSQL_PLUGIN_STATIC(maria, [libmaria.a])
# Maria will probably go first into max builds, not all builds, # Maria will probably go first into max builds, not all builds,
......
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