Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2330 06/04/13 12:10:47 acurtis@stripped +2 -0
WL#3201
add support for legacy storage engine configure arguments
improve help text - wrap text nicely, move plugin list to end of help
configure.in
1.362 06/04/13 12:10:43 acurtis@stripped +12 -12
WL#3201
add support for legacy storage engine configure arguments
config/ac-macros/plugins.m4
1.3 06/04/13 12:10:43 acurtis@stripped +39 -20
WL#3201
add support for legacy storage engine configure arguments
improve help text - wrap text nicely, move plugin list to end of help
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: acurtis
# Host: localhost.(none)
# Root: /home/antony/work2/wl3201.5
--- 1.361/configure.in 2006-04-13 03:13:30 -07:00
+++ 1.362/configure.in 2006-04-13 12:10:43 -07:00
@@ -52,36 +52,36 @@ romanian russian serbian slovak spanish
# Declare our plugin modules
#--------------------------------------------------------------------
-MYSQL_STORAGE_ENGINE(archive, [Archive Storage Engine],
+MYSQL_STORAGE_ENGINE(archive,, [Archive Storage Engine],
[Archive Storage Engine], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(archive, [storage/archive])
MYSQL_MODULE_STATIC(archive, [libarchive.a])
MYSQL_MODULE_DYNAMIC(archive, [ha_archive.la])
-MYSQL_STORAGE_ENGINE(berkeley, [BerkeleyDB Storage Engine],
+MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine],
[Transactional Tables using BerkeleyDB], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(berkeley,[storage/bdb])
MYSQL_MODULE_STATIC(berkeley, [[\$(bdb_libs_with_path)]])
MYSQL_MODULE_ACTIONS(berkeley, [MYSQL_SETUP_BERKELEY_DB])
-MYSQL_STORAGE_ENGINE(blackhole, [Blackhole Storage Engine],
+MYSQL_STORAGE_ENGINE(blackhole,,[Blackhole Storage Engine],
[Basic Write-only Read-never tables], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(blackhole, [storage/blackhole])
MYSQL_MODULE_STATIC(blackhole, [libblackhole.a])
MYSQL_MODULE_DYNAMIC(blackhole, [ha_blackhole.la])
-MYSQL_STORAGE_ENGINE(csv, [CSV Storage Engine],
+MYSQL_STORAGE_ENGINE(csv,, [CSV Storage Engine],
[Stores tables in text CSV format])
MYSQL_MODULE_DIRECTORY(csv, [storage/csv])
MYSQL_MODULE_STATIC(csv, [libcsv.a])
-MYSQL_STORAGE_ENGINE(example, [Example Storage Engine],
+MYSQL_STORAGE_ENGINE(example,, [Example Storage Engine],
[Skeleton for Storage Engines for developers], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(example, [storage/example])
MYSQL_MODULE_STATIC(example, [libexample.a])
MYSQL_MODULE_DYNAMIC(example, [ha_example.la])
-MYSQL_STORAGE_ENGINE(federated, [Federated Storage Engine],
+MYSQL_STORAGE_ENGINE(federated,,[Federated Storage Engine],
[Connects to tables on remote MySQL servers], [max,max-no-ndb])
MYSQL_MODULE(ftexample, [Simple Parser],
@@ -90,12 +90,12 @@ MYSQL_MODULE_DIRECTORY(ftexample, [plugi
MYSQL_MODULE_STATIC(ftexample, [libftexample.a])
MYSQL_MODULE_DYNAMIC(ftexample, [ft_example.la])
-MYSQL_STORAGE_ENGINE(heap, [Memory Storage Engine],
+MYSQL_STORAGE_ENGINE(heap,no, [Memory Storage Engine],
[In memory hashed tables])
MYSQL_MODULE_DIRECTORY(heap, [storage/heap])
MYSQL_MODULE_STATIC(heap, [libheap.a])
-MYSQL_STORAGE_ENGINE(innobase, [InnoDB Storage Engine],
+MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
[Transactional Tables using InnoDB], [max,max-no-ndb])
MYSQL_MODULE_DIRECTORY(innobase, [storage/innobase])
MYSQL_MODULE_STATIC(innobase, [libinnobase.a])
@@ -107,23 +107,23 @@ MYSQL_MODULE_ACTIONS(innobase, [
other_configures="$other_configures storage/innobase/configure"
])
-MYSQL_STORAGE_ENGINE(myisam, [MyISAM Storage Engine],
+MYSQL_STORAGE_ENGINE(myisam,no, [MyISAM Storage Engine],
[Traditional non-transactional MySQL tables])
MYSQL_MODULE_DIRECTORY(myisam, [storage/myisam])
MYSQL_MODULE_STATIC(myisam, [libmyisam.a])
-MYSQL_STORAGE_ENGINE(myisammrg, [MyISAM MERGE Engine],
+MYSQL_STORAGE_ENGINE(myisammrg,no,[MyISAM MERGE Engine],
[Merge multiple MySQL tables into one])
MYSQL_MODULE_DIRECTORY(myisammrg,[storage/myisammrg])
MYSQL_MODULE_STATIC(myisammrg, [libmyisammrg.a])
-MYSQL_STORAGE_ENGINE(ndbcluster, [Cluster Storage Engine],
+MYSQL_STORAGE_ENGINE(ndbcluster, ndbcluster, [Cluster Storage Engine],
[High Availability Clustered tables], [max])
MYSQL_MODULE_DIRECTORY(ndbcluster,[storage/ndb])
MYSQL_MODULE_STATIC(ndbcluster, [[\$(ndbcluster_libs) \$(ndbcluster_system_libs) \$(NDB_SCI_LIBS)]])
MYSQL_MODULE_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER])
-MYSQL_STORAGE_ENGINE(partition, [Partition Engine],
+MYSQL_STORAGE_ENGINE(partition, partition, [Partition Engine],
[MySQL Table Partitioning Engine], [max,max-no-ndb])
MYSQL_MODULE_MANDATORY(csv) dnl Used for logging
--- 1.2/config/ac-macros/plugins.m4 2006-04-13 03:13:30 -07:00
+++ 1.3/config/ac-macros/plugins.m4 2006-04-13 12:10:43 -07:00
@@ -54,8 +54,17 @@ dnl
dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_STORAGE_ENGINE],[ dnl
- MYSQL_MODULE([$1], [$2], [$3], [[$4]]) dnl
+ MYSQL_MODULE([$1], [$3], [$4], [[$5]]) dnl
MYSQL_MODULE_DEFINE([$1], [WITH_]AS_TR_CPP([$1])[_STORAGE_ENGINE]) dnl
+ ifelse([$2],[no],[],[ dnl
+ _MYSQL_LEGACY_STORAGE_ENGINE([$1],m4_default([$2], [$1-storage-engine])) dnl
+ ]) dnl
+])
+
+AC_DEFUN([_MYSQL_LEGACY_STORAGE_ENGINE],[
+if test "[${with_]m4_bpatsubst($2, -, _)[+set}]" = set; then
+ [with_module_]m4_bpatsubst($1, -, _)="[$with_]m4_bpatsubst($2, -, _)"
+fi dnl
])
@@ -468,16 +477,16 @@ AC_DEFUN([MYSQL_SHOW_PLUGIN],[ dnl
])
AC_DEFUN([_MYSQL_SHOW_PLUGIN],[
- === $3 plugin ===
- Module Name: [$1]
- Description: $4
- Build type: _PLUGIN_BUILD_TYPE([$7],[$8]) dnl
+ === Plug-in: $3 ===
+ Module Name: [$1]
+ Description: $4
+ Supports build: _PLUGIN_BUILD_TYPE([$7],[$8]) dnl
m4_ifdef([$12],[
- Configuration: m4_bpatsubst($12, :, [, ])]) dnl
+ Configurations: m4_bpatsubst($12, :, [, ])]) dnl
m4_ifdef([$10],[
- Status: disabled], [ dnl
+ Status: disabled], [ dnl
m4_ifdef([$9],[
- Status: mandatory])])])
+ Status: mandatory])])])
AC_DEFUN([_PLUGIN_BUILD_TYPE], dnl
[m4_ifdef([$1],[ifelse($1,[no],[],[static ]m4_ifdef([$2],[and dnl
@@ -546,18 +555,28 @@ AC_DEFUN([_MYSQL_GEN_DEPENDS], [ dnl
AC_DEFUN([_MYSQL_CHECK_PLUGIN_ARGS],[
- AC_ARG_WITH([modules],
- [ --with-modules=PLUGIN[[,PLUGIN...]]
- Select plugin modules for linking into mysqld
- May be list of modules or a configuration name
- (default is: $1)
- Available plugin configurations are:
- m4_ifdef([__mysql_metaplugin_list__], dnl
-[m4_bpatsubst(none:all:__mysql_metaplugin_list__, :, [, ])], dnl
-[none, all])
- Available plugin modules are:
- m4_indir([MYSQL_LIST_PLUGINS])], [mysql_modules="$withval"], dnl
- [mysql_modules=['$1']]) dnl
+
+ AC_ARG_WITH([modules], [
+ --with-modules=PLUGIN[[,PLUGIN..]]
+m4_text_wrap([Plugin modules to include in mysqld. (default is: $1)
+Must be configuration name or a comma seperated list of modules.],
+[ ])
+m4_text_wrap([Available configurations are: ]
+m4_bpatsubst(m4_ifdef([__mysql_metaplugin_list__], dnl
+none:all:__mysql_metaplugin_list__,none:all), :, [ ])[.],
+[ ])
+m4_text_wrap([Available plugin modules are: ] dnl
+m4_bpatsubst(__mysql_plugin_list__, :, [ ])[.], [ ])
+ --without-module-PLUGIN
+m4_text_wrap([Disable the named module from being built. Otherwise,
+for modules which are not selected for inclusion in mysqld will be
+built dynamically (if supported)],[ ])],
+[mysql_modules="$withval"], [mysql_modules=['$1']])
+
+m4_divert_once([HELP_VAR_END],[
+Description of plugin modules:
+m4_indir([MYSQL_LIST_PLUGINS])
+])
if test "$mysql_modules" == "all"; then
mysql_modules="m4_bpatsubst(__mysql_plugin_list__, :, [,])"
| Thread |
|---|
| • bk commit into 5.1 tree (acurtis:1.2330) | antony | 13 Apr |
