diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-03-21 10:03:43 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-03-21 10:03:43 +0200 |
| commit | 6665ead9baad673347f38043b1c5a6b270b61ebf (patch) | |
| tree | 20f8a35df08d45baafaa257e86d9c97d7ee55c08 | |
| parent | 5c2136039087a57f0e1e9b4b7f70f23bfbeece43 (diff) | |
| parent | c4f89626eeba1222e3a7c5f5bd9c9548a55b943d (diff) | |
| download | mariadb-git-6665ead9baad673347f38043b1c5a6b270b61ebf.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0
sql/sql_yacc.yy:
Auto merged
| -rw-r--r-- | mysql-test/r/query_cache.result | 12 | ||||
| -rw-r--r-- | mysql-test/t/query_cache.test | 13 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
3 files changed, 31 insertions, 2 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 41fccc2743c..0907abcbc86 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -564,3 +564,15 @@ show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 drop table t1; +drop table if exists t1; +create table t1 (a int); +insert into t1 values (1),(2),(3); +show status like "Qcache_queries_in_cache"; +Variable_name Value +Qcache_queries_in_cache 0 +select * from t1 into outfile "query_caceh.out.file"; +select * from t1 limit 1 into dumpfile "query_cache.dump.file"; +show status like "Qcache_queries_in_cache"; +Variable_name Value +Qcache_queries_in_cache 0 +drop table t1; diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index dd092866e44..f19d3bdc93a 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -406,4 +406,17 @@ select * from t1; show status like "Qcache_queries_in_cache"; load data infile '../../std_data/words.dat' into table t1; show status like "Qcache_queries_in_cache"; +drop table t1; + +# +# INTO OUTFILE/DUMPFILE test +# + +drop table if exists t1; +create table t1 (a int); +insert into t1 values (1),(2),(3); +show status like "Qcache_queries_in_cache"; +select * from t1 into outfile "query_caceh.out.file"; +select * from t1 limit 1 into dumpfile "query_cache.dump.file"; +show status like "Qcache_queries_in_cache"; drop table t1;
\ No newline at end of file diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index b986b72df32..8d56a403ba3 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -2450,13 +2450,17 @@ procedure_item: opt_into: INTO OUTFILE TEXT_STRING { - if (!(Lex->exchange= new sql_exchange($3.str,0))) + THD *thd= current_thd; + thd->safe_to_cache_query= 0; + if (!(thd->lex.exchange= new sql_exchange($3.str,0))) YYABORT; } opt_field_term opt_line_term | INTO DUMPFILE TEXT_STRING { - if (!(Lex->exchange= new sql_exchange($3.str,1))) + THD *thd= current_thd; + thd->safe_to_cache_query= 0; + if (!(thd->lex.exchange= new sql_exchange($3.str,1))) YYABORT; }; |