diff options
| author | unknown <konstantin@mysql.com> | 2005-05-30 21:47:20 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-30 21:47:20 +0400 |
| commit | 595e3609cd81d84f790cfcda93b7e2e7f16d1d0f (patch) | |
| tree | ad78350b6aa2c1144edff54c293787bf0d491c06 /sql/sql_delete.cc | |
| parent | 89e50fd17b7898a720b09d89ce9b4e800ca4b856 (diff) | |
| parent | 7878189d39af6fd22a7cc06a2a9de8d81b1adaf8 (diff) | |
| download | mariadb-git-595e3609cd81d84f790cfcda93b7e2e7f16d1d0f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-7306-new
sql/sql_delete.cc:
Auto merged
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 672972ccb72..d4a3b6c684e 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -300,8 +300,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) SELECT_LEX *select_lex= &thd->lex->select_lex; DBUG_ENTER("mysql_prepare_delete"); - if (setup_tables(thd, table_list, conds, &select_lex->leaf_tables, - FALSE, FALSE) || + if (setup_tables(thd, table_list, conds, &select_lex->leaf_tables, FALSE) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || setup_ftfuncs(select_lex)) DBUG_RETURN(TRUE); @@ -358,7 +357,7 @@ bool mysql_multi_delete_prepare(THD *thd) lex->query_tables also point on local list of DELETE SELECT_LEX */ if (setup_tables(thd, lex->query_tables, &lex->select_lex.where, - &lex->select_lex.leaf_tables, FALSE, FALSE)) + &lex->select_lex.leaf_tables, FALSE)) DBUG_RETURN(TRUE); |