summaryrefslogtreecommitdiff
path: root/mysql-test/main/drop_combinations.result
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2021-01-06 10:53:00 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2021-01-06 10:53:00 +0100
commit02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1 (patch)
tree4a6a8d578fedb4c2b1f437ab39c2d7430ad95163 /mysql-test/main/drop_combinations.result
parent5f10870c8a8c2448bfc26d990110390d48000b84 (diff)
parent478b83032b170b2ae030fa77fe4bed60a7910472 (diff)
downloadmariadb-git-02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1.tar.gz
Merge commit '10.4' into 10.5
Diffstat (limited to 'mysql-test/main/drop_combinations.result')
-rw-r--r--mysql-test/main/drop_combinations.result17
1 files changed, 12 insertions, 5 deletions
diff --git a/mysql-test/main/drop_combinations.result b/mysql-test/main/drop_combinations.result
index 140665efd19..a939bcd2b51 100644
--- a/mysql-test/main/drop_combinations.result
+++ b/mysql-test/main/drop_combinations.result
@@ -599,7 +599,8 @@ Note 4091 Unknown SEQUENCE: 'test.s4,test.s3'
# Generating test tables
drop temporary sequence if exists s1,t1,t2,s2;
Warnings:
-Note 4091 Unknown SEQUENCE: 'test.t1,test.t2'
+Note 4090 'test.t1' is not a SEQUENCE
+Note 4090 'test.t2' is not a SEQUENCE
# Generating test tables
drop temporary sequence if exists s1,v1,v2,s2;
Warnings:
@@ -607,18 +608,24 @@ Note 4091 Unknown SEQUENCE: 'test.v1,test.v2'
# Generating test tables
drop temporary sequence if exists v1,t1,t2,v2,s2;
Warnings:
-Note 4091 Unknown SEQUENCE: 'test.v1,test.t1,test.t2,test.v2'
+Note 4090 'test.t1' is not a SEQUENCE
+Note 4090 'test.t2' is not a SEQUENCE
+Note 4091 Unknown SEQUENCE: 'test.v1,test.v2'
# Generating test tables
drop temporary sequence if exists s1,t1,v1,t3,s4;
Warnings:
-Note 4091 Unknown SEQUENCE: 'test.t1,test.v1,test.t3,test.s4'
+Note 4090 'test.t1' is not a SEQUENCE
+Note 4091 Unknown SEQUENCE: 'test.v1,test.t3,test.s4'
drop temporary sequence if exists t2,v2,s2,s1;
Warnings:
-Note 4091 Unknown SEQUENCE: 'test.t2,test.v2,test.s1'
+Note 4090 'test.t2' is not a SEQUENCE
+Note 4091 Unknown SEQUENCE: 'test.v2,test.s1'
# Generating test tables
drop temporary sequence if exists t1,v1,t2,v2;
Warnings:
-Note 4091 Unknown SEQUENCE: 'test.t1,test.v1,test.t2,test.v2'
+Note 4090 'test.t1' is not a SEQUENCE
+Note 4090 'test.t2' is not a SEQUENCE
+Note 4091 Unknown SEQUENCE: 'test.v1,test.v2'
# Generating test tables
drop temporary table t1,t2;
drop temporary sequence s1,s2;