2902 Tatiana A. Nurnberg 2008-11-04 [merge]
auto-merge
modified:
include/mysql_com.h
sql/sql_delete.cc
sql/unireg.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc 2008-10-24 13:21:52 +0000
+++ b/sql/mysqld.cc 2008-11-04 10:03:36 +0000
@@ -6969,9 +6969,10 @@ The minimum value for this variable is 4
"Directory for plugins.",
(uchar**) &opt_plugin_dir_ptr, (uchar**) &opt_plugin_dir_ptr, 0,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
- {"plugin_load", OPT_PLUGIN_LOAD,
- "Optional colon separated list of plugins to load, where each plugin is "
- "identified by name and path to library seperated by an equals.",
+ {"plugin-load", OPT_PLUGIN_LOAD,
+ "Optional colon-separated list of plugins to load, where each plugin is "
+ "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,
GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"preload_buffer_size", OPT_PRELOAD_BUFFER_SIZE,
| Thread |
|---|
| • bzr push into mysql-6.0 branch (azundris:2902) | Tatiana A. Nurnberg | 4 Nov |
