diff options
| author | unknown <psergey@psergey.(none)> | 2003-11-13 22:14:37 +0300 |
|---|---|---|
| committer | unknown <psergey@psergey.(none)> | 2003-11-13 22:14:37 +0300 |
| commit | 738728bd1144a29a9b8b380c6a129afc3acdcfc4 (patch) | |
| tree | ee449f3b5dcb528030efbeea367fa2b4c2183c94 /sql/sql_union.cc | |
| parent | 4696bb41b4cce563ffff8d7b6c32576214109113 (diff) | |
| parent | 6e464cc06d8340cb5f0f26fd6894301eef55af1f (diff) | |
| download | mariadb-git-738728bd1144a29a9b8b380c6a129afc3acdcfc4.tar.gz | |
merging in index_merge (in progress, not yet working)
BitKeeper/etc/logging_ok:
auto-union
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 934cda3b1a8..ff68f26d765 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -117,7 +117,8 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, { SELECT_LEX *lex_select_save= thd->lex->current_select; SELECT_LEX *select_cursor,*sl; - DBUG_ENTER("st_select_lex_unit::prepare"); + SELECT_LEX *sl; + DBUG_ENTER("st_select_lex_unit::prepare"); if (prepared) DBUG_RETURN(0); @@ -187,7 +188,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, union_result->not_describe=1; union_result->tmp_table_param=tmp_table_param; - for (;sl; sl= sl->next_select()) + for (;sl; sl= sl->next_select()) //!!todo: psergey: all my changes around this were to shut up the compiler. check they didn't make it here { JOIN *join= new JOIN(thd, sl->item_list, sl->options | thd->options | SELECT_NO_UNLOCK, |