database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

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


sql/sql_plugin.cc:
  Auto merged
This commit is contained in:
unknown
2007-04-28 14:16:12 +02:00
parent 2f0eaa5a47 b6965ac352
commit 860217e5f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_plugin.cc
View File

@@ -2475,10 +2475,10 @@ SHOW_TYPE sys_var_pluginvar::show_type()
byte* sys_var_pluginvar::real_value_ptr(THD *thd, enum_var_type 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 (plugin_var->flags & PLUGIN_VAR_THDLOCAL)
{ {
if (type != OPT_SESSION) if (type == OPT_GLOBAL)
thd= NULL; thd= NULL;
return intern_sys_var_ptr(thd, *(int*) (plugin_var+1), false); return intern_sys_var_ptr(thd, *(int*) (plugin_var+1), false);