summaryrefslogtreecommitdiff
path: root/sql/sql_union.cc
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-03-15 14:11:11 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-03-15 14:11:11 +0200
commit3b2e1fd276094597cfb500bc8b9f27a193bfb60c (patch)
treea25d01855444721b4ec388407fb61159f5bb4370 /sql/sql_union.cc
parent606e3e9550f78894604bac0d4fbf473309798bf2 (diff)
downloadmariadb-git-3b2e1fd276094597cfb500bc8b9f27a193bfb60c.tar.gz
Making full-text queries working with UNION's
Diffstat (limited to 'sql/sql_union.cc')
-rw-r--r--sql/sql_union.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 60155e0ce8d..7d921d6e598 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -126,7 +126,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
}
union_result->save_time_stamp=!describe;
- for (sl=&lex->select_lex;sl;sl=sl->next)
+ for (sl=lex->select=&lex->select_lex;sl;sl=lex->select=sl->next)
{
thd->offset_limit=sl->offset_limit;
thd->select_limit=sl->select_limit+sl->offset_limit;
@@ -155,6 +155,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
delete union_result;
/* Send result to 'result' */
+ lex->select = &lex->select_lex;
res =-1;
{
/* Create a list of fields in the temporary table */