diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-19 14:07:52 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-19 14:07:52 +0200 |
| commit | 7fc36355bc9b3678109b53209b84fe718da498ce (patch) | |
| tree | 767475bf73bc5e960912ea2923dda9f65b5cebf6 /sql/sql_union.cc | |
| parent | ef38d5c3a9b393abe5276a64e5137a5be025264a (diff) | |
| download | mariadb-git-7fc36355bc9b3678109b53209b84fe718da498ce.tar.gz | |
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.
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 82a88633b69..0aca2668941 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -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, |