database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-09-26 20:49:51 +02:00
parent 7aba6f8f88 dcbd51cee6
commit 57e0da50bb
436 changed files with 9699 additions and 196654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_truncate.cc
View File

@ -299,7 +299,7 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref,
if (thd->locked_tables_mode)
{
if (!(table= find_table_for_mdl_upgrade(thd, table_ref->db.str,
table_ref->table_name.str, FALSE)))
table_ref->table_name.str, NULL)))
DBUG_RETURN(TRUE);
*hton_can_recreate= ha_check_storage_engine_flag(table->file->ht,