Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936

into chilla.local:/home/mydev/mysql-5.1-wl2936

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-wl2936
into chilla.local:/home/mydev/mysql-5.1-wl2936
4f8e86db · istruewing@chilla.local · 7dfd5e8d · 352c273d · 4f8e86db
Commit 4f8e86db authored Apr 28, 2007 by istruewing@chilla.local
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_plugin.cc sql/sql_plugin.cc +2 -2

No files found.
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -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);