diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 09:33:07 +0300 |
| commit | 7c7ac6d4a4c77d4c302732da2efe6785b1f0e455 (patch) | |
| tree | 652c6fd4576bab721661075f3ef1f3962251c8c9 /mysql-test/suite/maria/mrr.result | |
| parent | b73c70c265cab9bae2fd5c243b484172bec0a91d (diff) | |
| parent | 789f55c947a8aa224e5b0a71d5c0bea375320091 (diff) | |
| download | mariadb-git-7c7ac6d4a4c77d4c302732da2efe6785b1f0e455.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/suite/maria/mrr.result')
| -rw-r--r-- | mysql-test/suite/maria/mrr.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/maria/mrr.result b/mysql-test/suite/maria/mrr.result index a99bbfabe86..066f1a50aab 100644 --- a/mysql-test/suite/maria/mrr.result +++ b/mysql-test/suite/maria/mrr.result @@ -9,7 +9,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL -) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 +) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9); create table t2(a int); insert into t2 select A.a + 10*(B.a + 10*C.a) from t1 A, t1 B, t1 C; |