summaryrefslogtreecommitdiff
path: root/mysql-test/main/subselect_sj2_mat.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-09-13 16:36:38 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-09-13 16:36:38 +0300
commit18795f55122b04cb5c9ea19498b720735b80714b (patch)
tree1a749eeaaabaa86e9b755cef817a6267a6b59960 /mysql-test/main/subselect_sj2_mat.result
parent9a8faeea142ea6f575419799c9439f4673971573 (diff)
parent68ce0231ad6a16e02db9d67a217a88055b6d01ff (diff)
downloadmariadb-git-18795f55122b04cb5c9ea19498b720735b80714b.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/subselect_sj2_mat.result')
-rw-r--r--mysql-test/main/subselect_sj2_mat.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/subselect_sj2_mat.result b/mysql-test/main/subselect_sj2_mat.result
index e2c9adbfc37..be6fc6289e6 100644
--- a/mysql-test/main/subselect_sj2_mat.result
+++ b/mysql-test/main/subselect_sj2_mat.result
@@ -723,7 +723,7 @@ t2 CREATE TABLE `t2` (
`a` int(11) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `a` (`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
set @a=0;
create table t3 as select * from t2 limit 0;
insert into t3 select @a:=@a+1, t2.a from t2, t0;