diff options
| author | Sergei Golubchik <serg@mysql.com> | 2008-06-05 21:48:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mysql.com> | 2008-06-05 21:48:43 +0200 |
| commit | 17a9470e0897027edefc42aa6299cefa8afa1327 (patch) | |
| tree | 8f436e0a32a99c36f0bfde0f134d4630b627d469 | |
| parent | ab75389acd66dd04756440ea0c7d00ed2be64a66 (diff) | |
| download | mariadb-git-17a9470e0897027edefc42aa6299cefa8afa1327.tar.gz | |
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
| -rw-r--r-- | config/ac-macros/plugins.m4 | 6 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | storage/maria/plug.in | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 8dfb698709f..62789e2fb15 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -280,7 +280,7 @@ dnl --------------------------------------------------------------------------- dnl Macro: MYSQL_CONFIGURE_PLUGINS dnl dnl SYNOPSIS -dnl MYSQL_PLUGIN_DEPENDS([name,name...]) +dnl MYSQL_CONFIGURE_PLUGINS([name,name...]) dnl dnl DESCRIPTION dnl Used last, emits all required shell code to configure the plugins @@ -735,13 +735,13 @@ dnl Emits shell script for checking configure arguments dnl Arguments to this macro is default value for selected plugins 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_ARG_WITH([plugins], 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.]) AS_HELP_STRING([], [Available configurations are:] dnl diff --git a/configure.in b/configure.in index d338828c5cc..4e74c708181 100644 --- a/configure.in +++ b/configure.in @@ -2387,7 +2387,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, diff --git a/storage/maria/plug.in b/storage/maria/plug.in index 063ad7c65e4..02a6466bddc 100644 --- a/storage/maria/plug.in +++ b/storage/maria/plug.in @@ -1,5 +1,5 @@ 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_STATIC(maria, [libmaria.a]) # Maria will probably go first into max builds, not all builds, |