diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-03 15:22:39 +0100 |
| commit | 72c20282db820b0b0818aea160a485bdca897eec (patch) | |
| tree | 3089e022d958990fc0a405a38ba43ae00c87103c /sql/sql_union.cc | |
| parent | 5e1d5d9bc0bf9ea776bffe6c4914a84be920c0b2 (diff) | |
| parent | 2acc01b3cfa27074f93016b893cda20fa0a3497f (diff) | |
| download | mariadb-git-72c20282db820b0b0818aea160a485bdca897eec.tar.gz | |
10.0-base merge
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 d143930908d..ff2da863db8 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -653,7 +653,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); |