diff options
| author | unknown <dkatz@damien-katzs-computer.local> | 2007-06-19 18:18:59 -0400 |
|---|---|---|
| committer | unknown <dkatz@damien-katzs-computer.local> | 2007-06-19 18:18:59 -0400 |
| commit | 13dd2419b5b9c8d0efeb020579cb351b728f1173 (patch) | |
| tree | f922183932bbe1c9cee65fa8486a4044cb23b205 /sql/sql_yacc.yy | |
| parent | 75689af808d935de69a39138e35cde575c982251 (diff) | |
| parent | bfc61f2ea961aa2ce9af4d047a616978e26e2913 (diff) | |
| download | mariadb-git-13dd2419b5b9c8d0efeb020579cb351b728f1173.tar.gz | |
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
into damien-katzs-computer.local:/Users/dkatz/mysql51
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index e3f79fe2d69..1c00ac98c03 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -6158,8 +6158,12 @@ select_option: } | SQL_CACHE_SYM { - /* Honor this flag only if SQL_NO_CACHE wasn't specified. */ - if (Lex->select_lex.sql_cache != SELECT_LEX::SQL_NO_CACHE) + /* + Honor this flag only if SQL_NO_CACHE wasn't specified AND + we are parsing the outermost SELECT in the query. + */ + if (Lex->select_lex.sql_cache != SELECT_LEX::SQL_NO_CACHE && + Lex->current_select == &Lex->select_lex) { Lex->safe_to_cache_query=1; Lex->select_lex.options|= OPTION_TO_QUERY_CACHE; |