bzr push into mysql-5.1 branch (azundris:2691 to 2692) Bug#39117

[Tatiana A. Nurnberg]

 2692 Tatiana A. Nurnberg	2008-11-04
      Bug#39117 "plugin_load" option not documented
      
      correct text describing the --plugin-load option to mysqld
modified:
  sql/mysqld.cc

 2691 Georgi Kodinov	2008-11-03 [merge]
      merged 5.1-bugteam -> B33811 5.1 working tree
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-20 13:45:18 +0000
+++ b/sql/mysqld.cc	2008-11-04 10:00:26 +0000
@@ -6666,9 +6666,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,