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 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä
2021-07-22 11:22:09 +03:00
parent 593885f785 5f4314f0e6
commit cee37b5d26
67 changed files with 442 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_table.cc
View File

@ -1235,7 +1235,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
bool wrong_drop_sequence= 0;
bool table_dropped= 0, res;
bool is_temporary= 0;
bool was_view= 0, was_table= 0;
const LEX_CSTRING db= table->db;
const LEX_CSTRING table_name= table->table_name;
LEX_CSTRING cpath= {0,0};
@ -1392,7 +1391,7 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
}
thd->replication_flags= 0;
was_view= table_type == TABLE_TYPE_VIEW;
const bool was_view= table_type == TABLE_TYPE_VIEW;
if (!table_count++)
{
@ -1414,7 +1413,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables,
. "DROP SEQUENCE", but it's not a sequence
*/
wrong_drop_sequence= drop_sequence && hton;
was_table|= wrong_drop_sequence;
error= table_type == TABLE_TYPE_UNKNOWN ? ENOENT : -1;
tdc_remove_table(thd, db.str, table_name.str);
if (wrong_drop_sequence)