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

after-merge fixes

Browse Source 
in innobase: compilation error on windows
other changes: perfschema merge followup
This commit is contained in:
Sergei Golubchik
2015-06-16 23:55:56 +02:00
parent 27f0bd7d95
commit 985e430c0f
13 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_table.cc
View File

@ -1672,6 +1672,7 @@ void execute_ddl_log_recovery()
(void) mysql_file_delete(key_file_global_ddl_log, file_name, MYF(0));
global_ddl_log.recovery_phase= FALSE;
mysql_mutex_unlock(&LOCK_gdl);
thd->reset_query();
delete thd;
/* Remember that we don't have a THD */
set_current_thd(0);