diff options
| author | unknown <sanja@montyprogram.com> | 2014-01-15 16:07:50 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2014-01-15 16:07:50 +0200 |
| commit | b0aaf5c6f56d98c86c98c2a079e5915ad482eec9 (patch) | |
| tree | 49f85e01563a74ae965c38feca0f218e2880c39a /sql/sql_union.cc | |
| parent | 4e9a2d5469cd3baebcd3cce33db9b39d6ec9b67c (diff) | |
| parent | 3aa370bb693ba734131fc2d581da538b9d2a2aa7 (diff) | |
| download | mariadb-git-b0aaf5c6f56d98c86c98c2a079e5915ad482eec9.tar.gz | |
Merge 5.3->5.5
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 72f1df2f4ae..82fe7f2936a 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -647,7 +647,10 @@ bool st_select_lex_unit::exec() { ha_rows records_at_start= 0; thd->lex->current_select= sl; - fake_select_lex->uncacheable|= sl->uncacheable; + if (sl != &thd->lex->select_lex) + fake_select_lex->uncacheable|= sl->uncacheable; + else + fake_select_lex->uncacheable= 0; { set_limit(sl); |