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_load.cc | |
| parent | 072d38eb129bcecb1afba5c5efb61bcc21e78fea (diff) | |
| download | mariadb-git-1e3d8b0839597d5fa4b9d1e4e1535eda30e82f93.tar.gz | |
post-merge fix
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index edd72851a21..21dd2318504 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -122,7 +122,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(TRUE); if (setup_tables(thd, table_list, &unused_conds, - &thd->lex->select_lex.leaf_tables, 0)) + &thd->lex->select_lex.leaf_tables, FALSE, FALSE)) DBUG_RETURN(-1); if (!table_list->table || // do not suport join view !table_list->updatable || // and derived tables @@ -147,8 +147,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, /* TODO: use this conds for 'WITH CHECK OPTIONS' */ Item *unused_conds= 0; TABLE_LIST *leaves= 0; - if (setup_tables(thd, table_list, &unused_conds, &leaves, 0) || - setup_fields(thd, 0, table_list, fields, 1, 0, 0)) + if (setup_fields(thd, 0, table_list, fields, 1, 0, 0)) DBUG_RETURN(TRUE); if (thd->dupp_field) { |