diff options
| author | unknown <sergefp@mysql.com> | 2003-11-20 23:27:11 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2003-11-20 23:27:11 +0300 |
| commit | bc20df185777934065c1974c90e7f81bc71d89cd (patch) | |
| tree | c6b6240f792d738e5cb60f287415eb3f4c380f08 /sql/sql_union.cc | |
| parent | 738728bd1144a29a9b8b380c6a129afc3acdcfc4 (diff) | |
| download | mariadb-git-bc20df185777934065c1974c90e7f81bc71d89cd.tar.gz | |
logging_ok:
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
Post-merge fixes
Many files:
new file
sql/opt_ft.h:
Post-merge fixes
sql/opt_range.cc:
Post-merge fixes
sql/opt_range.h:
Post-merge fixes
sql/sql_select.cc:
Post-merge fixes
sql/sql_union.cc:
Post-merge fixes
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index ff68f26d765..c2bf9e0c66a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -117,7 +117,6 @@ 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; - SELECT_LEX *sl; DBUG_ENTER("st_select_lex_unit::prepare"); if (prepared) @@ -188,7 +187,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()) //!!todo: psergey: all my changes around this were to shut up the compiler. check they didn't make it here + for (;sl; sl= sl->next_select()) { JOIN *join= new JOIN(thd, sl->item_list, sl->options | thd->options | SELECT_NO_UNLOCK, |