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

MDEV-4786 - merge 10.0-monty - 10.0

Browse Source 
Fixed main.innodb_mysql_sync failure.

TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE is not same as
TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE. Comment in sql_table.cc says:

      Storage engine has requested exclusive lock only for prepare phase
      and we are not under LOCK TABLES.
      Don't mark TABLE_SHARE as old in this case, as this won't allow opening
      of table by other threads during main phase of in-place ALTER TABLE.

At this moment we hold exclusive metadata lock, all we should do
is purge unused TABLE objects.

sql/sql_base.cc:
  Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.
sql/sql_base.h:
  Restore 5.6 behavior of TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE.
This commit is contained in:
Sergey Vojtovich 2013-07-25 13:40:18 +04:00
parent 9388822c5d
commit e33e9825a4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_base.cc
View File

@ -9611,7 +9611,7 @@ void tdc_remove_table(THD *thd, enum_tdc_remove_table_type remove_type,
*/ */
if (remove_type == TDC_RT_REMOVE_NOT_OWN) if (remove_type == TDC_RT_REMOVE_NOT_OWN)
share->remove_from_cache_at_close(); share->remove_from_cache_at_close();
else else if (remove_type != TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE)
{ {
/* Ensure that no can open the table while it's used */ /* Ensure that no can open the table while it's used */
share->protect_against_usage(); share->protect_against_usage();

4
sql/sql_base.h
View File

@ -61,8 +61,8 @@ enum find_item_error_report_type {REPORT_ALL_ERRORS, REPORT_EXCEPT_NOT_FOUND,
enum enum_tdc_remove_table_type {TDC_RT_REMOVE_ALL, TDC_RT_REMOVE_NOT_OWN, enum enum_tdc_remove_table_type {TDC_RT_REMOVE_ALL, TDC_RT_REMOVE_NOT_OWN,
TDC_RT_REMOVE_UNUSED, TDC_RT_REMOVE_UNUSED,
TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE}; TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE,
#define TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE TDC_RT_REMOVE_NOT_OWN_AND_MARK_NOT_USABLE TDC_RT_REMOVE_NOT_OWN_KEEP_SHARE};
/* bits for last argument to remove_table_from_cache() */ /* bits for last argument to remove_table_from_cache() */
#define RTFC_NO_FLAG 0x0000 #define RTFC_NO_FLAG 0x0000