diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-01-30 15:44:49 +0200 |
| commit | 87eb2cb938382b545158987a1cc6bc170588db3a (patch) | |
| tree | a6a00e2376ec5327aa29d5a5b2441a06f8d146d4 /mysql-test/t/query_cache.test | |
| parent | 093a6dd90e12ca41e7e415f57f5a91181bf1959e (diff) | |
| parent | f7a24d72dc7a86341da4634f6d1a71f1ea77000b (diff) | |
| download | mariadb-git-87eb2cb938382b545158987a1cc6bc170588db3a.tar.gz | |
merged 5.1-main -> 5.1-bugteam
Diffstat (limited to 'mysql-test/t/query_cache.test')
| -rw-r--r-- | mysql-test/t/query_cache.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 6b1ef211fc1..7841e7274dd 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -423,7 +423,7 @@ create table t1 (word char(20) not null); select * from t1; show status like "Qcache_queries_in_cache"; --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR -eval load data infile '$MYSQLTEST_VARDIR/std_data_ln/words.dat' into table t1; +eval load data infile '$MYSQLTEST_VARDIR/std_data/words.dat' into table t1; show status like "Qcache_queries_in_cache"; select count(*) from t1; drop table t1; @@ -804,10 +804,10 @@ create procedure `p1`() begin select a, f1() from t1; end// -SET @log_bin_trust_function_creators = @@global.log_bin_trust_function_creators; +SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators; SET GLOBAL log_bin_trust_function_creators = 1; call p1()// -SET GLOBAL log_bin_trust_function_creators = @log_bin_trust_function_creators; +SET GLOBAL log_bin_trust_function_creators = @old_log_bin_trust_function_creators; drop procedure p1// drop function f1// |