diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-30 17:13:10 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-08-30 17:13:10 +0300 |
| commit | 8309920506e57b94a8a56693b248be284f3d3c44 (patch) | |
| tree | 5cdc5d33efc11a183321a4a82df36c76119f846b /sql/sql_union.cc | |
| parent | 914bc8686e4908e8602327745953f764fd39c596 (diff) | |
| download | mariadb-git-8309920506e57b94a8a56693b248be284f3d3c44.tar.gz | |
Fix for a compilation problem with VC++
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 24497589c73..011c1a5a8b8 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -116,7 +116,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, bool tables_and_fields_initied) { SELECT_LEX *lex_select_save= thd->lex.current_select; - SELECT_LEX *select_cursor; + SELECT_LEX *select_cursor,*sl; DBUG_ENTER("st_select_lex_unit::prepare"); if (prepared) @@ -130,7 +130,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *sel_result, t_and_f= tables_and_fields_initied; bzero((char *)&tmp_table_param,sizeof(TMP_TABLE_PARAM)); - thd->lex.current_select= select_cursor= first_select_in_union(); + thd->lex.current_select= sl= select_cursor= first_select_in_union(); /* Global option */ if (t_and_f) { @@ -185,7 +185,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 (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select()) + for (;sl; sl= sl->next_select()) { JOIN *join= new JOIN(thd, sl->item_list, sl->options | thd->options | SELECT_NO_UNLOCK, |