diff options
author | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-11-11 21:18:10 +0200 |
commit | 3bc1fcd409eb08474884a556fef193d707117212 (patch) | |
tree | b838d2bae358ea54b828bff0e3dfb8a0faf1bc8e /sql/item_subselect.cc | |
parent | e5fd013fdf6c8664daa0bbdcaf0d22bf44e90d62 (diff) | |
parent | 5b82bc6644fb766c7a04b49d60e70c474450ce28 (diff) | |
download | mariadb-git-3bc1fcd409eb08474884a556fef193d707117212.tar.gz |
merge
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index f426f14a25f..16a08dca009 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1422,7 +1422,7 @@ void subselect_uniquesubquery_engine::exclude() table_map subselect_engine::calc_const_tables(TABLE_LIST *table) { table_map map= 0; - for(; table; table= table->next_local) + for(; table; table= table->next_leaf) { TABLE *tbl= table->table; if (tbl && tbl->const_table) @@ -1435,14 +1435,13 @@ table_map subselect_engine::calc_const_tables(TABLE_LIST *table) table_map subselect_single_select_engine::upper_select_const_tables() { return calc_const_tables((TABLE_LIST *) select_lex->outer_select()-> - table_list.first); + leaf_tables); } table_map subselect_union_engine::upper_select_const_tables() { - return calc_const_tables((TABLE_LIST *) unit->outer_select()-> - table_list.first); + return calc_const_tables((TABLE_LIST *) unit->outer_select()->leaf_tables); } |