summaryrefslogtreecommitdiff
path: root/mysql-test/suite/funcs_1
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:00:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-04-06 13:00:09 +0300
commit2d8e38bc9477aa00b371ed14d95390bede70c5cb (patch)
tree7d4e4e22138572b769263994697d69bd141c5bf3 /mysql-test/suite/funcs_1
parentb249abde57f1788a8085f45cc6252ee70ece3354 (diff)
parent4e1ca388381eea27a9275571744ad17ce317b273 (diff)
downloadmariadb-git-2d8e38bc9477aa00b371ed14d95390bede70c5cb.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/funcs_1')
-rw-r--r--mysql-test/suite/funcs_1/r/innodb_trig_0407.result2
-rw-r--r--mysql-test/suite/funcs_1/r/memory_trig_0407.result2
-rw-r--r--mysql-test/suite/funcs_1/r/myisam_trig_0407.result2
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
index 371bc935945..d551575960e 100644
--- a/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/innodb_trig_0407.result
@@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
-ERROR HY000: Trigger's 't1_temp' is view or temporary table
+ERROR HY000: Trigger's 't1_temp' is a view, temporary table or sequence
drop table t1_temp;
Testcase 3.5.5.3:
diff --git a/mysql-test/suite/funcs_1/r/memory_trig_0407.result b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
index 00457776b02..ceae360946c 100644
--- a/mysql-test/suite/funcs_1/r/memory_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/memory_trig_0407.result
@@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
-ERROR HY000: Trigger's 't1_temp' is view or temporary table
+ERROR HY000: Trigger's 't1_temp' is a view, temporary table or sequence
drop table t1_temp;
Testcase 3.5.5.3:
diff --git a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
index 00457776b02..ceae360946c 100644
--- a/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
+++ b/mysql-test/suite/funcs_1/r/myisam_trig_0407.result
@@ -237,7 +237,7 @@ Testcase 3.5.5.2:
Create temporary table t1_temp (f1 bigint signed, f2 bigint unsigned);
Create trigger trg2 before INSERT
on t1_temp for each row set new.f2=9999;
-ERROR HY000: Trigger's 't1_temp' is view or temporary table
+ERROR HY000: Trigger's 't1_temp' is a view, temporary table or sequence
drop table t1_temp;
Testcase 3.5.5.3: