diff options
author | monty@narttu.mysql.fi <> | 2002-10-14 12:07:16 +0300 |
---|---|---|
committer | monty@narttu.mysql.fi <> | 2002-10-14 12:07:16 +0300 |
commit | 3c7f6a98357a0867a0a16c4c2a636ec83bdf72fd (patch) | |
tree | 26137c7c29554f0b9d1336080b6cdc1044fb6839 /sql/sql_union.cc | |
parent | da2abaf8878313534106c39d361660e21ceda8ba (diff) | |
parent | d9f998164d6612da1b5a32858de7b9d34929036c (diff) | |
download | mariadb-git-3c7f6a98357a0867a0a16c4c2a636ec83bdf72fd.tar.gz |
merge
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r-- | sql/sql_union.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index c2ef25ce6a1..01b0eb9e6ec 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -104,11 +104,16 @@ bool select_union::flush() typedef JOIN * JOIN_P; int st_select_lex_unit::prepare(THD *thd, select_result *result) { + DBUG_ENTER("st_select_lex_unit::prepare"); + + if (prepared) + DBUG_RETURN(0); + prepared= 1; + describe=(first_select()->options & SELECT_DESCRIBE) ? 1 : 0; res= 0; found_rows_for_union= false; TMP_TABLE_PARAM tmp_table_param; - DBUG_ENTER("st_select_lex_unit::prepare"); this->thd= thd; this->result= result; SELECT_LEX *lex_select_save= thd->lex.select, *sl; |