diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-16 10:08:30 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-16 10:08:30 +0300 |
| commit | 734db318ac69f60959bcd0d6c9116a3681449a38 (patch) | |
| tree | cb8ccd4ecfebe752ec559834d3bf083efb9c8cd4 /sql/sql_truncate.cc | |
| parent | b151cc2b0b1fc938de91035fbafc46667d9019e3 (diff) | |
| parent | 8716bb3b72b7f5fed69b6dde413c2138f6d175b2 (diff) | |
| download | mariadb-git-734db318ac69f60959bcd0d6c9116a3681449a38.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_truncate.cc')
| -rw-r--r-- | sql/sql_truncate.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index d515aacd1d0..34177242704 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -350,7 +350,8 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref, { DEBUG_SYNC(thd, "upgrade_lock_for_truncate"); /* To remove the table from the cache we need an exclusive lock. */ - if (wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_DROP)) + if (wait_while_table_is_used(thd, table, + *hton_can_recreate ? HA_EXTRA_PREPARE_FOR_DROP : HA_EXTRA_NOT_USED)) DBUG_RETURN(TRUE); m_ticket_downgrade= table->mdl_ticket; /* Close if table is going to be recreated. */ |