Commit 2b3fa955 authored by Kristofer Pettersson's avatar Kristofer Pettersson

Automerge

parents e7efb6e5 3b50efc3
...@@ -6666,9 +6666,10 @@ The minimum value for this variable is 4096.", ...@@ -6666,9 +6666,10 @@ The minimum value for this variable is 4096.",
"Directory for plugins.", "Directory for plugins.",
(uchar**) &opt_plugin_dir_ptr, (uchar**) &opt_plugin_dir_ptr, 0, (uchar**) &opt_plugin_dir_ptr, (uchar**) &opt_plugin_dir_ptr, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"plugin_load", OPT_PLUGIN_LOAD, {"plugin-load", OPT_PLUGIN_LOAD,
"Optional colon separated list of plugins to load, where each plugin is " "Optional colon-separated list of plugins to load, where each plugin is "
"identified by name and path to library seperated by an equals.", "identified as name=library, where name is the plugin name and library "
"is the plugin library in plugin_dir.",
(uchar**) &opt_plugin_load, (uchar**) &opt_plugin_load, 0, (uchar**) &opt_plugin_load, (uchar**) &opt_plugin_load, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"preload_buffer_size", OPT_PRELOAD_BUFFER_SIZE, {"preload_buffer_size", OPT_PRELOAD_BUFFER_SIZE,
......
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