From: paul Date: June 2 2006 8:56pm Subject: svn commit - mysqldoc@docsrva: r2263 - in trunk: . internals List-Archive: http://lists.mysql.com/commits/7231 Message-Id: <200606022056.k52KufxG020085@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: paul Date: 2006-06-02 22:56:40 +0200 (Fri, 02 Jun 2006) New Revision: 2263 Log: r10936@frost: paul | 2006-06-02 15:56:26 -0500 Tweaks to plugin macro section. (Mostly adding markup.) Modified: trunk/ trunk/internals/internals.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10205 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10934 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10205 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10936 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663 Modified: trunk/internals/internals.xml =================================================================== --- trunk/internals/internals.xml 2006-06-02 19:56:45 UTC (rev 2262) +++ trunk/internals/internals.xml 2006-06-02 20:56:40 UTC (rev 2263) @@ -3275,14 +3275,14 @@ Beginning with MySQL 5.1, the server supports a plugin architecture for loading plugins. For example, several storage engines have been converted to plugins, and they can be selected - of disabled at configuration time by means of command-options to - configure. + or disabled at configuration time by means of command-line + options to configure. This section describes the command-line options that are used to - control which plugins get built, and the Autoconf macros that - enable a plugin configuration support to be described. + control which plugins get built, and the autotools macros that + enable plugin configuration support to be described.
@@ -3377,13 +3377,10 @@ For any plugin that is not explicitly selected or disabled, it is selected to be built dynamically if it supports dynamic build, and not built if it does not support dynamic build. - - - - Thus, in the case that no plugin options are given, all + (Thus, in the case that no plugin options are given, all plugins that support dynamic build are selected to be built as dynamic plugins. Plugins that do not support dynamic build are - not built. + not built.)
@@ -3397,278 +3394,311 @@ configuration files. - - Declaring a plugin: - + + + + Declaring a plugin: + + -MYSQL_PLUGIN(name, long-name, description [,configlist]) +MYSQL_PLUGIN(name, long-name, description [,configlist]) - - Each plugin is required to have - MYSQL_PLUGIN() declared first. The - configlist is an optional argument that is - a comma-separated list of configurations of which the module - is a member. - + + Each plugin is required to have + MYSQL_PLUGIN() declared first. + configlist is an optional + argument that is a comma-separated list of configurations + of which the module is a member. + - - Example: - + + Example: + MYSQL_PLUGIN(ftexample, [Simple Parser], [Simple full-text parser plugin]) + - - Declaring a storage engine plugin: - + + + Declaring a storage engine plugin: + -MYSQL_STORAGE_ENGINE(name, legacy-opt, long-name, description [,configlist]) +MYSQL_STORAGE_ENGINE(name, legacy-opt, long-name, description [,configlist]) - - This is a simple utility macro that calls - MYSQL_PLUGIN. It performs the bare basics - required to declare a storage engine plugin and provides - support for handling the legacy configure - command-line options. If the legacy-opt is - not specified, it will default to - . - Set the legacy-opt value to - no if you do not want to handle any legacy - option. - + + This is a simple utility macro that calls + MYSQL_PLUGIN. It performs the bare + basics required to declare a storage engine plugin and + provides support for handling the legacy + configure command-line options. If + legacy-opt is not specified, it + will default to + . + Set the legacy-opt value to + no if you do not want to handle any + legacy option. + - - This macro is roughly equivalent to: - + + This macro is roughly equivalent to: + -MYSQL_PLUGIN(name, long-name, description) -MYSQL_PLUGIN_DEFINE(name, WITH_name_STORAGE_ENGINE) +MYSQL_PLUGIN(name, long-name, description) +MYSQL_PLUGIN_DEFINE(name, WITH_NAME_STORAGE_ENGINE) - - Example: - + + Example: + MYSQL_STORAGE_ENGINE(berkeley, berkeley-db, [BerkeleyDB Storage Engine], [Transactional Tables using BerkeleyDB], [max,max-no-ndb]) + - - Declaring a C preprocessor variable: - + + + Declaring a C preprocessor variable: + -MYSQL_PLUGIN_DEFINE(name, define-name) +MYSQL_PLUGIN_DEFINE(name, define-name) - - When a plugin will be included in a static build, this will - set a preprocessor variable to 1. These preprocessor variables - are defined in config.h. - + + When a plugin will be included in a static build, this + will set a preprocessor variable to 1. These preprocessor + variables are defined in config.h. + - - Example: - + + Example: + MYSQL_PLUGIN_DEFINE(innobase, WITH_INNOBASE_STORAGE_ENGINE) + - - Declaring a source directory for a plugin: - + + + Declaring a source directory for a plugin: + -MYSQL_PLUGIN_DIRECTORY(name, dir-name) +MYSQL_PLUGIN_DIRECTORY(name, dir-name) - - Includes the specified directory into the build. If a file - named configure is detected in the - directory, it will be executed as part of the - configure build otherwise it is assumed - that there is a Makefile to be built in - that directory. Currently, there is only support for plugin - directories to be specified in the - storage/ and plugin/ - subdirectories. - + + Includes the specified directory into the build. If a file + named configure is detected in the + directory, it will be executed as part of the + configure build otherwise it is assumed + that there is a Makefile to be built + in that directory. Currently, there is only support for + plugin directories to be specified in the + storage/ and + plugin/ subdirectories. + - - Example: - + + Example: + MYSQL_PLUGIN_DIRECTORY(archive, [storage/archive]) + - - Declaring a static library name for a plugin: - + + + Declaring a static library name for a plugin: + -MYSQL_PLUGIN_STATIC(name, lib-name) +MYSQL_PLUGIN_STATIC(name, lib-name) - - Sets the configure substitution - @plugin_NAME_static_target@ to the supplied library name if - the plugin is a static build. It also adds the library to the - list of libraries to be linked into mysqld. - It may either be just the name of the library where if there - is a directory specified then the directory will be prepended - for the link or if the supplied argument is another - make variable or substitution, it will be - passed through as is. - + + Sets the configure substitution + @plugin_name_static_target@ + to the supplied library name if the plugin is a static + build. It also adds the library to the list of libraries + to be linked into mysqld. It may either + be just the name of the library (where, if there is a + directory specified, the directory will be prepended for + the link) or another make variable or + substitution (in which case, it will be passed through as + is). + - - Example: - + + Example: + MYSQL_PLUGIN_STATIC(archive, [libarchive.a]) MYSQL_PLUGIN_STATIC(berkeley, [[\$(bdb_libs_with_path)]]) + - - Declaring a dynamic library name for a plugin: - + + + Declaring a dynamic library name for a plugin: + -MYSQL_PLUGIN_DYNAMIC(name, dso-name) +MYSQL_PLUGIN_DYNAMIC(name, dso-name) - - Sets the configure substitution - @plugin_NAME_shared_target@ to the supplied - library name if the module is a dynamic build. - + + Sets the configure substitution + @plugin_name_shared_target@ + to the supplied dynamic shared object library name if the + module is a dynamic build. + - - Example: - + + Example: + MYSQL_PLUGIN_DYNAMIC(archive, [ha_archive.la]) + - - Declaring a plugin as a mandatory module: - + + + Declaring a plugin as a mandatory module: + -MYSQL_PLUGIN_MANDATORY(name) +MYSQL_PLUGIN_MANDATORY(name) - - Mandatory plugins cannot be disabled. - + + Mandatory plugins cannot be disabled. + - - Example: - + + Example: + MYSQL_PLUGIN_MANDATORY(myisam) + - - Declaring a plugin as disabled: - + + + Declaring a plugin as disabled: + -MYSQL_PLUGIN_DISABLED(name) +MYSQL_PLUGIN_DISABLED(name) - - A disabled plugin will not be included in any build. If the - plugin has been marked as MANDATORY, it - will result in an autoconf error. - + + A disabled plugin will not be included in any build. If + the plugin has been marked as + MANDATORY, it will result in an + autoconf error. + + - - Declaring additional plugin configure - actions: - + + + Declaring additional plugin configure + actions: + -MYSQL_PLUGIN_ACTIONS(name, configure-actions) +MYSQL_PLUGIN_ACTIONS(name, configure-actions) - - Useful if there are additional configure - actions required for a plugin. The - configure-actions argument may either be - the name of an autoconf macro or it may be - more autoconf script. - + + This is useful if there are additional + configure actions required for a + plugin. The configure-actions + argument may either be the name of an + autoconf macro or more + autoconf script. + - - Example: - + + Example: + MYSQL_PLUGIN_ACTIONS(ndbcluster,[MYSQL_SETUP_NDBCLUSTER]) + - - Declaring plugin dependencies: - + + + Declaring plugin dependencies: + -MYSQL_PLUGIN_DEPENDS(name, dependencies) +MYSQL_PLUGIN_DEPENDS(name, dependencies) - - Declares all plugins, in a comma-seperated list, that are - required for the named plugin to be built. If the named plugin - is selected, it will in turn enable all its depenencies. All - plugins listed as a dependency must already have been declared - with MYSQL_PLUGIN(). - + + Declares all plugins, in a comma-separated list, that are + required for the named plugin to be built. If the named + plugin is selected, it will in turn enable all its + depenencies. All plugins listed as a dependency must + already have been declared with + MYSQL_PLUGIN(). + - - Example: - + + Example: + MYSQL_PLUGIN_DEPENDS(ndbcluster, [partition]) + - - Performing the magic: - + + + Performing the magic: + -MYSQL_CONFIGURE_PLUGINS(default-names) +MYSQL_CONFIGURE_PLUGINS(default-names) - - Actually performs the task of generating the shell scripts for - configure based upon the declarations made - previously. It emits the shell code neccessary to check the - options and sets the variables accordingly. - + + Actually performs the task of generating the shell scripts + for configure based upon the + declarations made previously. It emits the shell code + neccessary to check the options and sets the variables + accordingly. + - - Example: - + + Example: + MYSQL_CONFIGURE_PLUGINS([none]) + + + - configure errors: + Plugin-related configure errors: @@ -3684,7 +3714,7 @@ When any of the plugins specified in the dependency list - doesn't exist, configure aborts with an + don't exist, configure aborts with an error. @@ -3692,7 +3722,7 @@ When a mandatory plugin is specified in - , + , configure aborts with an error. @@ -3701,7 +3731,7 @@ When a disabled plugin is specified in or - , + , configure reports an error. @@ -3710,7 +3740,7 @@ When an optional plugin that may only be built dynamically is specified in or - , + , configure emits a warning and continues to configure the plugin for dynamic build. @@ -3719,9 +3749,9 @@ When an optional plugin that may only be built statically - is not specified in - nor - , + is specified neither in + nor + , configure emits a warning but should proceed anyway.