diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-22 13:26:13 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-03-22 13:26:13 +0200 |
| commit | f34e7d709b4126b7d0bc41e07873ffc0b47d3e56 (patch) | |
| tree | f22df3327341cfcd016876fcdc66c1ddd6e22036 /sql/sql_union.cc | |
| parent | d62d98de7c0a930e27889885351cdf2591f146f9 (diff) | |
| download | mariadb-git-f34e7d709b4126b7d0bc41e07873ffc0b47d3e56.tar.gz | |
Fixes for offset bug in UNION's and making UNION's obey
SELECT_DEFAULT_LIMIT
Docs/manual.texi:
Monty forced me to do this
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 0aca2668941..1658fa701c5 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -186,7 +186,10 @@ int mysql_union(THD *thd, LEX *lex,select_result *result) thd->options&= ~OPTION_FOUND_ROWS; } else - thd->select_limit= HA_POS_ERROR; // no limit + { + thd->offset_limit= 0; + thd->select_limit= thd->default_select_limit; + } if (describe) thd->select_limit= HA_POS_ERROR; // no limit res=mysql_select(thd,&result_table_list, |