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:52:09 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-21 09:52:09 +0300
commit4345d9310080e6e4cbf1040263a2653f7d3d9227 (patch)
tree84b4f98615e1ec93d2bf12443e0de514783dd0db /mysql-test/main/intersect_all.result
parent90d899c30f4091e67989167806545e9a1d933355 (diff)
parent7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (diff)
downloadmariadb-git-4345d9310080e6e4cbf1040263a2653f7d3d9227.tar.gz
Merge 10.7 into 10.8
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 4589d226fa3..6c7a9c1cdd2 100644
--- a/mysql-test/main/intersect_all.result
+++ b/mysql-test/main/intersect_all.result
@@ -682,7 +682,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