diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2002-12-25 15:07:36 +0200 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2002-12-25 15:07:36 +0200 |
| commit | 672a695f8f37da99b09180958076752231f09728 (patch) | |
| tree | 7d7d23defccb62f9a5cf7a6a5a9ddc253479e2aa /sql/sql_union.cc | |
| parent | 7f304a2746923894a2d5fe1a2f1c5ad11cfe17c3 (diff) | |
| download | mariadb-git-672a695f8f37da99b09180958076752231f09728.tar.gz | |
bug fixes and tests ...
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 10175bfe345..cdd34977e5a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -279,9 +279,10 @@ int st_select_lex_unit::exec() } if (!thd->fatal_error) // Check if EOM { - offset_limit_cnt= global_parameters->offset_limit; - select_limit_cnt= global_parameters->select_limit+ - global_parameters->offset_limit; + SELECT_LEX *sl=thd->lex.current_select->master_unit()->first_select(); + offset_limit_cnt= (sl->braces) ? global_parameters->offset_limit : 0; + select_limit_cnt= (sl->braces) ? global_parameters->select_limit+ + global_parameters->offset_limit : HA_POS_ERROR; if (select_limit_cnt < global_parameters->select_limit) select_limit_cnt= HA_POS_ERROR; // no limit if (select_limit_cnt == HA_POS_ERROR) |