diff options
author | unknown <bell@sanja.is.com.ua> | 2002-10-30 13:18:52 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2002-10-30 13:18:52 +0200 |
commit | 0bb1e716bcb14aa8321893b906aaf79f32b7c577 (patch) | |
tree | 27649c1870a43321e1b60ed8b0693461db05b8f1 /sql/item_subselect.cc | |
parent | fc4c9c01ee8105888b75f01728f651c4c496cc22 (diff) | |
download | mariadb-git-0bb1e716bcb14aa8321893b906aaf79f32b7c577.tar.gz |
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
fixed some possible bugs
sql/item.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_subselect.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_sum.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/mysql_priv.h:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_base.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_cache.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_delete.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.h:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
fixed some possible bugs
sql/sql_parse.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_prepare.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_repl.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_select.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_union.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_update.cc:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_yacc.yy:
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index 456ce5f22ba..d0a10e25fa5 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -252,8 +252,8 @@ int subselect_single_select_engine::prepare() if (prepared) return 0; prepared= 1; - SELECT_LEX *save_select= thd->lex.select; - thd->lex.select= select_lex; + SELECT_LEX_NODE *save_select= thd->lex.current_select; + thd->lex.current_select= select_lex; if(join->prepare((TABLE_LIST*) select_lex->table_list.first, select_lex->where, (ORDER*) select_lex->order_list.first, @@ -262,7 +262,7 @@ int subselect_single_select_engine::prepare() (ORDER*) 0, select_lex, select_lex->master_unit(), 0)) return 1; - thd->lex.select= save_select; + thd->lex.current_select= save_select; return 0; } @@ -310,7 +310,7 @@ int subselect_single_select_engine::exec() DBUG_RETURN(join->error?join->error:1); } } - if (select_lex->depended && executed) + if (select_lex->dependent && executed) { if (join->reinit()) DBUG_RETURN(1); @@ -319,10 +319,10 @@ int subselect_single_select_engine::exec() } if (!executed) { - SELECT_LEX *save_select= join->thd->lex.select; - join->thd->lex.select= select_lex; + SELECT_LEX_NODE *save_select= join->thd->lex.current_select; + join->thd->lex.current_select= select_lex; join->exec(); - join->thd->lex.select= save_select; + join->thd->lex.current_select= save_select; executed= 1; DBUG_RETURN(join->error||thd->fatal_error); } @@ -346,10 +346,10 @@ uint subselect_union_engine::cols() bool subselect_single_select_engine::depended() { - return select_lex->depended; + return select_lex->dependent; } bool subselect_union_engine::depended() { - return unit->depended; + return unit->dependent; } |