bk commit into 5.1 tree (istruewing:1.2586)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-27 23:42:22+02:00, istruewing@stripped +1 -0
  WL#2936 - Falcon & MySQL plugin interface: server variables
  Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)

  sql/sql_plugin.cc@stripped, 2007-04-27 23:42:11+02:00, istruewing@stripped +2 -2
    WL#2936 - Falcon & MySQL plugin interface: server variables
    Changed back (type != OPT_SESSION) to (type == OPT_GLOBAL)

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-wl2936

--- 1.55/sql/sql_plugin.cc	2007-04-27 23:42:58 +02:00
+++ 1.56/sql/sql_plugin.cc	2007-04-27 23:42:58 +02:00
@@ -2474,10 +2474,10 @@ SHOW_TYPE sys_var_pluginvar::show_type()
 
 byte* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type type)
 {
-  DBUG_ASSERT(thd || (type != OPT_SESSION));
+  DBUG_ASSERT(thd || (type == OPT_GLOBAL));
   if (plugin_var->flags & PLUGIN_VAR_THDLOCAL)
   {
-    if (type != OPT_SESSION)
+    if (type == OPT_GLOBAL)
       thd= NULL;
 
     return intern_sys_var_ptr(thd, *(int*) (plugin_var+1), false);