diff options
| author | unknown <monty@mysql.com> | 2005-08-15 18:35:48 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-08-15 18:35:48 +0300 |
| commit | c5aac211d02ebf672237141fbe767dd9d3af26da (patch) | |
| tree | 613842f6646a144777e4e07d77c2a89dbb659781 /sql/sql_delete.cc | |
| parent | e8b26c090348f2db3e4f33483a9135cd931f5687 (diff) | |
| parent | 3b422187f6829da234914c713e4e8039c97e7291 (diff) | |
| download | mariadb-git-c5aac211d02ebf672237141fbe767dd9d3af26da.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_class.cc:
Manual merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 6c35653291d..35183fc959b 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -301,6 +301,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) DBUG_ENTER("mysql_prepare_delete"); if (setup_tables(thd, &thd->lex->select_lex.context, + &thd->lex->select_lex.top_join_list, table_list, conds, &select_lex->leaf_tables, FALSE) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || @@ -359,6 +360,7 @@ bool mysql_multi_delete_prepare(THD *thd) lex->query_tables also point on local list of DELETE SELECT_LEX */ if (setup_tables(thd, &thd->lex->select_lex.context, + &thd->lex->select_lex.top_join_list, lex->query_tables, &lex->select_lex.where, &lex->select_lex.leaf_tables, FALSE)) DBUG_RETURN(TRUE); |