database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

mysql-5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-01-16 20:16:35 +01:00
parent c56483d972 ed1ba992c1
commit 38e3ae155d
321 changed files with 5432 additions and 3995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_plugin.cc
View File

@ -3112,8 +3112,9 @@ bool sys_var_pluginvar::session_update(THD *thd, set_var *var)
const void *src= var->value ? (void*)&var->save_result
: (void*)real_value_ptr(thd, OPT_GLOBAL);
mysql_mutex_unlock(&LOCK_global_system_variables);
plugin_var->update(thd, plugin_var, tgt, src);
plugin_var->update(thd, plugin_var, tgt, src);
return false;
}
@ -3176,7 +3177,6 @@ bool sys_var_pluginvar::global_update(THD *thd, set_var *var)
}
plugin_var->update(thd, plugin_var, tgt, src);
return false;
}