diff options
| author | monty@narttu.mysql.fi <> | 2002-10-08 22:28:24 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2002-10-08 22:28:24 +0300 |
| commit | da2abaf8878313534106c39d361660e21ceda8ba (patch) | |
| tree | 362ce44d140ce7362c738d3068b9786f24043b0d /sql/sql_union.cc | |
| parent | 226535865bea8f5be21f6c4d8f6a616b5ffc7982 (diff) | |
| download | mariadb-git-da2abaf8878313534106c39d361660e21ceda8ba.tar.gz | |
Portability fixes to be able to compile MySQL with VC++
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 1a18759eb5b..c2ef25ce6a1 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -111,7 +111,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result) DBUG_ENTER("st_select_lex_unit::prepare"); this->thd= thd; this->result= result; - SELECT_LEX *lex_select_save= thd->lex.select; + SELECT_LEX *lex_select_save= thd->lex.select, *sl; /* Global option */ if (((void*)(global_parameters)) == ((void*)this)) @@ -179,7 +179,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result) // prepare selects joins.empty(); - for (SELECT_LEX *sl= first_select(); sl; sl= sl->next_select()) + for (sl= first_select(); sl; sl= sl->next_select()) { JOIN *join= new JOIN(thd, sl->item_list, sl->options | thd->options | SELECT_NO_UNLOCK | |