diff options
| author | ingo@mysql.com <> | 2005-12-27 10:31:00 +0100 |
|---|---|---|
| committer | ingo@mysql.com <> | 2005-12-27 10:31:00 +0100 |
| commit | ef52a5941878ade2a27bec81589445b61869fa5e (patch) | |
| tree | b4448bbf385fd96fc00b6783cc8e9f1a08ac15aa /sql/sql_delete.cc | |
| parent | 14384b840168f8cedfda0ec728e7d406b1b515bb (diff) | |
| parent | bd72782899819ea9cbb1e6633fb4d3a1215d5bbb (diff) | |
| download | mariadb-git-ef52a5941878ade2a27bec81589445b61869fa5e.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-bug5390
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 393e8184725..d8a8f28b92b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -348,7 +348,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); @@ -438,7 +438,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, |