summaryrefslogtreecommitdiff
path: root/mysql-test/t/query_cache_notembedded.test
diff options
context:
space:
mode:
authormsvensson@neptunus.(none) <>2006-12-04 19:11:55 +0100
committermsvensson@neptunus.(none) <>2006-12-04 19:11:55 +0100
commit971c783f7dd3a136693722f20a815b7171bbbcd8 (patch)
treeac382a3e694ccbe7ed5a481331e35e4f055fdcae /mysql-test/t/query_cache_notembedded.test
parent6072b7a4c4b786604b4584058c6c62a339b6d3ba (diff)
parentb70d2b9341ae804fbd5147500a4d29bd86e2a5d6 (diff)
downloadmariadb-git-971c783f7dd3a136693722f20a815b7171bbbcd8.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
Diffstat (limited to 'mysql-test/t/query_cache_notembedded.test')
-rw-r--r--mysql-test/t/query_cache_notembedded.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/t/query_cache_notembedded.test b/mysql-test/t/query_cache_notembedded.test
index 97be9f9f7ca..802022d061b 100644
--- a/mysql-test/t/query_cache_notembedded.test
+++ b/mysql-test/t/query_cache_notembedded.test
@@ -183,6 +183,8 @@ drop table t1;
#
# bug#14767: INSERT in SF + concurrent SELECT with query cache
#
+SET GLOBAL log_bin_trust_function_creators = 1;
+
reset query cache;
--disable_warnings
drop function if exists f1;
@@ -222,3 +224,4 @@ disconnect con2;
connection default;
set GLOBAL query_cache_size=0;
+SET GLOBAL log_bin_trust_function_creators = 0;