diff options
| author | unknown <sanja@montyprogram.com> | 2012-02-10 16:23:18 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-02-10 16:23:18 +0200 |
| commit | 804c69ab835eb13f892fbaf1766f923e19ce7d6e (patch) | |
| tree | 81a0481fca92ba6970bf83e0abe2096be7a29d45 /sql/sql_derived.cc | |
| parent | 6e9b06d90bd8a833d7daf3dbc9927a36ba2137e5 (diff) | |
| download | mariadb-git-804c69ab835eb13f892fbaf1766f923e19ce7d6e.tar.gz | |
Fix set_limit to be uniform with all calls.
Fix of set_limit in case of an error (actually impossible case but better it will be right)
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 13985becff7..63c5bb30474 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -750,7 +750,7 @@ bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived) if (!derived->is_merged_derived()) { JOIN *join= first_select->join; - unit->set_limit(first_select); + unit->set_limit(unit->global_parameters); unit->optimized= TRUE; if ((res= join->optimize())) goto err; @@ -865,7 +865,7 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) } else { - unit->set_limit(first_select); + unit->set_limit(unit->global_parameters); if (unit->select_limit_cnt == HA_POS_ERROR) first_select->options&= ~OPTION_FOUND_ROWS; |