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

Initial merge result with mariaDB 10: lp:maria

Browse Source
This commit is contained in:
Seppo Jaakola
2013-07-13 13:01:13 +03:00
parent 58926b5e19
commit 0a9216835f
160 changed files with 9800 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_plugin.cc
View File

@ -3049,11 +3049,17 @@ void plugin_thdvar_init(THD *thd)
thd->variables.dynamic_variables_size= 0;
thd->variables.dynamic_variables_ptr= 0;
#ifdef WITH_WSREP
if (!WSREP(thd) || !thd->wsrep_applier) {
#endif
mysql_mutex_lock(&LOCK_plugin);
thd->variables.table_plugin=
intern_plugin_lock(NULL, global_system_variables.table_plugin);
intern_plugin_unlock(NULL, old_table_plugin);
mysql_mutex_unlock(&LOCK_plugin);
#ifdef WITH_WSREP
}
#endif
DBUG_VOID_RETURN;
}