1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix plugin locking/unlocking when assisted discovery fails

Browse Source
This commit is contained in:
Sergei Golubchik 2013-04-19 20:35:37 +02:00
parent faf4d99d22
commit 337c1b3ee8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_table.cc
View File

@ -4420,6 +4420,16 @@ bool mysql_create_table_no_lock(THD *thd,
goto err; goto err;
ha_err= hton->discover_table_structure(hton, thd, &share, create_info); ha_err= hton->discover_table_structure(hton, thd, &share, create_info);
/*
if discovery failed, the plugin will be auto-unlocked, as it
was locked on the THD, see above.
if discovery succeeded, the plugin was replaced by a globally
locked plugin, that will be unlocked by free_table_share()
*/
if (ha_err)
share.db_plugin= 0; // will be auto-freed, locked above on the THD
free_table_share(&share); free_table_share(&share);
if (ha_err) if (ha_err)