summaryrefslogtreecommitdiff
path: root/mysql-test/main/trigger.test
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
commit588efca2374536aab956e6366f96082f2886c73c (patch)
treeaf1b126c795cd1255d7c7d72c201c01339119755 /mysql-test/main/trigger.test
parentb6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff)
parent1feccb505f9ec5cada8f8e2c544f736c1a533633 (diff)
downloadmariadb-git-588efca2374536aab956e6366f96082f2886c73c.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/trigger.test')
-rw-r--r--mysql-test/main/trigger.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/main/trigger.test b/mysql-test/main/trigger.test
index ef89f86590c..f2f2001eb37 100644
--- a/mysql-test/main/trigger.test
+++ b/mysql-test/main/trigger.test
@@ -1,6 +1,7 @@
# This test uses chmod, can't be run with root permissions
-- source include/not_as_root.inc
---source include/default_charset.inc
+-- source include/no_valgrind_without_big.inc
+-- source include/default_charset.inc
#
# Basic triggers test