bk commit into 5.0 tree (konstantin:1.2014)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2014 05/10/25 00:03:51 konstantin@stripped +2 -0
  Comments and a cleanup in sql_plugin.{h,cc}

  sql/sql_plugin.h
    1.9 05/10/25 00:03:42 konstantin@stripped +6 -2
    Add comments.

  sql/sql_plugin.cc
    1.16 05/10/25 00:03:42 konstantin@stripped +2 -1
    Clarify an error message (to be rewritten using a reference to a 
    multi-language error message).

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-cnet

--- 1.15/sql/sql_plugin.cc	2005-10-24 15:39:18 +04:00
+++ 1.16/sql/sql_plugin.cc	2005-10-25 00:03:42 +04:00
@@ -543,7 +543,8 @@
   {
     if (tmp->plugin->init())
     {
-      my_error(ER_CANT_INITIALIZE_UDF, MYF(0), name->str, ER(ER_UNKNOWN_ERROR));
+      my_error(ER_CANT_INITIALIZE_UDF, MYF(0), name->str,
+               "Plugin initialization function failed.");
       goto err;
     }
     tmp->state= PLUGIN_IS_READY;

--- 1.8/sql/sql_plugin.h	2005-10-04 16:27:14 +04:00
+++ 1.9/sql/sql_plugin.h	2005-10-25 00:03:42 +04:00
@@ -25,22 +25,26 @@
   PLUGIN_IS_READY
 };
 
+/* A handle for the dynamic library containing a plugin or plugins. */
+
 struct st_plugin_dl
 {
   LEX_STRING dl;
   void *handle;
   struct st_mysql_plugin *plugins;
   int version;
-  uint ref_count;
+  uint ref_count;            /* number of plugins loaded from the library */
 };
 
+/* A handle of a plugin */
+
 struct st_plugin_int
 {
   LEX_STRING name;
   struct st_mysql_plugin *plugin;
   struct st_plugin_dl *plugin_dl;
   enum enum_plugin_state state;
-  uint ref_count;
+  uint ref_count;           /* number of threads using the plugin */
 };
 
 extern char *opt_plugin_dir;