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

aftermerge fix

This commit is contained in:
unknown
2005-09-21 17:38:26 +02:00
parent aa7bc459f7
commit 4956432b12
5 changed files with 11 additions and 8 deletions

View File

@ -7175,8 +7175,11 @@ bool multi_delete_set_locks_and_link_aux_tables(LEX *lex)
target_tbl->table_name, "MULTI DELETE");
DBUG_RETURN(TRUE);
}
target_tbl->table_name= walk->table_name;
target_tbl->table_name_length= walk->table_name_length;
if (!walk->derived)
{
target_tbl->table_name= walk->table_name;
target_tbl->table_name_length= walk->table_name_length;
}
walk->updating= target_tbl->updating;
walk->lock_type= target_tbl->lock_type;
target_tbl->correspondent_table= walk; // Remember corresponding table