summaryrefslogtreecommitdiff
path: root/mysql-test/main/intersect_all.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:33:07 +0300
commit7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch)
tree652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/main/intersect_all.result
parentb73c70c265cab9bae2fd5c243b484172bec0a91d (diff)
parent789f55c947a8aa224e5b0a71d5c0bea375320091 (diff)
downloadmariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/intersect_all.result')
-rw-r--r--mysql-test/main/intersect_all.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/intersect_all.result b/mysql-test/main/intersect_all.result
index 8fe82b89380..96bfb9ca1fb 100644
--- a/mysql-test/main/intersect_all.result
+++ b/mysql-test/main/intersect_all.result
@@ -608,7 +608,7 @@ Table Create Table
t4 CREATE TABLE `t4` (
`a` int(11) DEFAULT NULL,
`b` blob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop tables t4;
(select a,b from t1) intersect all (select c,d from t2) intersect all (select e,f from t3) union all (select 4,4);
a b