diff options
| author | bell@sanja.is.com.ua <> | 2004-11-25 02:23:13 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2004-11-25 02:23:13 +0200 |
| commit | 1e3d8b0839597d5fa4b9d1e4e1535eda30e82f93 (patch) | |
| tree | b6370530d805ecddad3284428883cac10256f774 /sql/sql_select.cc | |
| parent | 072d38eb129bcecb1afba5c5efb61bcc21e78fea (diff) | |
| download | mariadb-git-1e3d8b0839597d5fa4b9d1e4e1535eda30e82f93.tar.gz | |
post-merge fix
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 433bc147169..ae60eb759d0 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -310,7 +310,8 @@ JOIN::prepare(Item ***rref_pointer_array, /* Check that all tables, fields, conds and order are ok */ - if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, 0) || + if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, + FALSE, FALSE) || setup_wild(thd, tables_list, fields_list, &all_fields, wild_num) || select_lex->setup_ref_array(thd, og_num) || setup_fields(thd, (*rref_pointer_array), tables_list, fields_list, 1, @@ -1081,7 +1082,8 @@ JOIN::reinit() if (tables_list) { tables_list->setup_is_done= 0; - if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, 1)) + if (setup_tables(thd, tables_list, &conds, &select_lex->leaf_tables, + TRUE, FALSE)) DBUG_RETURN(1); } |