bk commit into 5.1 tree (serg:1.2583)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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@stripped, 2007-04-23 19:05:38+02:00, serg@stripped +1 -0
  warning added

  sql/sql_plugin.cc@stripped, 2007-04-23 19:05:34+02:00, serg@stripped +10 -4
    warning added

# 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:	serg
# Host:	janus.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1-wl2936

--- 1.52/sql/sql_plugin.cc	2007-04-23 19:05:45 +02:00
+++ 1.53/sql/sql_plugin.cc	2007-04-23 19:05:45 +02:00
@@ -2683,7 +2683,7 @@
   st_bookmark *v;
   DBUG_ENTER("construct_options");
   DBUG_PRINT("plugin", ("plugin: '%s'  enabled: %d  can_disable: %d",
-                        tmp->plugin->name, **enabled, can_disable));
+                        plugin_name, **enabled, can_disable));
 
   /* support --skip-plugin-foo syntax */
   memcpy(name, plugin_name, namelen + 1);
@@ -2759,7 +2759,7 @@
       break;
     default:
       sql_print_error("Unknown variable type code 0x%x in plugin '%s'.",
-                      opt->flags, tmp->plugin->name);
+                      opt->flags, plugin_name);
       DBUG_RETURN(-1);
     };
   }
@@ -2799,7 +2799,13 @@
       {
         opt->update= update_func_str;
         if (!(opt->flags & PLUGIN_VAR_MEMALLOC))
+        {
           opt->flags |= PLUGIN_VAR_READONLY;
+          sql_print_warning("Server variable %s of plugin %s was forced "
+                            "to be read-only: string variable without "
+                            "update_func and PLUGIN_VAR_MEMALLOC flag",
+                            opt->name, plugin_name);
+        }
       }
       break;
     case PLUGIN_VAR_ENUM:
@@ -2816,7 +2822,7 @@
       break;
     default:
       sql_print_error("Unknown variable type code 0x%x in plugin '%s'.",
-                      opt->flags, tmp->plugin->name);
+                      opt->flags, plugin_name);
       DBUG_RETURN(-1);
     }
 
@@ -2826,7 +2832,7 @@
     if (!opt->name)
     {
       sql_print_error("Missing variable name in plugin '%s'.",
-                      tmp->plugin->name);
+                      plugin_name);
       DBUG_RETURN(-1);
     }