1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

fix for the limit bug in UNION's and some additional syntax

checkings


mysql-test/r/union.result:
  fix for the limit bug in UNION's
mysql-test/t/union.test:
  fix for the limit bug in UNION's
sql/sql_union.cc:
  fix for the limit bug in UNION's
sql/sql_yacc.yy:
  Syntax checking for options that should appear in main select only.
This commit is contained in:
unknown
2002-03-19 14:07:52 +02:00
parent ef38d5c3a9
commit 7fc36355bc
4 changed files with 38 additions and 7 deletions

View File

@@ -185,6 +185,8 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
if (thd->select_limit == HA_POS_ERROR)
thd->options&= ~OPTION_FOUND_ROWS;
}
else
thd->select_limit= HA_POS_ERROR; // no limit
if (describe)
thd->select_limit= HA_POS_ERROR; // no limit
res=mysql_select(thd,&result_table_list,