Merge sinisa@work.mysql.com:/home/bk/mysql-4.1

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1

Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.1
229959ac · unknown · 3d5dc65d · 2224fe96 · 229959ac · 229959ac
Commit 229959ac authored Feb 21, 2002 by unknown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 174 additions and 131 deletions

sql/sql_select.cc sql/sql_select.cc +168 -131

sql/sql_union.cc sql/sql_union.cc +6 -0

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -76,6 +76,12 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
    for (sl= &lex->select_lex; sl; sl=sl->next)
    {
      lex->select=sl;
+      thd->offset_limit=sl->offset_limit;
+      thd->select_limit=sl->select_limit+sl->offset_limit;
+      if (thd->select_limit < sl->select_limit)
+	thd->select_limit= HA_POS_ERROR;		// no limit
+      if (thd->select_limit == HA_POS_ERROR)
+	sl->options&= ~OPTION_FOUND_ROWS;
      res=mysql_select(thd, (TABLE_LIST*) sl->table_list.first,
 		       sl->item_list,
 		       sl->where,