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

BUG#5390 - problems with merge tables

Browse Source 
Problem #1: INSERT...SELECT, Version for 5.1.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
This commit is contained in:
ingo@mysql.com
2005-12-22 13:48:00 +01:00
parent 7b8fa1e3c6
commit a04c5adb0b
12 changed files with 216 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_delete.cc
View File

@ -374,7 +374,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)
}
{
TABLE_LIST *duplicate;
if ((duplicate= unique_table(table_list, table_list->next_global)))
if ((duplicate= unique_table(thd, table_list, table_list->next_global)))
{
update_non_unique_table_error(table_list, "DELETE", duplicate);
DBUG_RETURN(TRUE);
@ -464,7 +464,7 @@ bool mysql_multi_delete_prepare(THD *thd)
*/
{
TABLE_LIST *duplicate;
if ((duplicate= unique_table(target_tbl->correspondent_table,
if ((duplicate= unique_table(thd, target_tbl->correspondent_table,
lex->query_tables)))
{
update_non_unique_table_error(target_tbl->correspondent_table,