diff options
| author | Alexander Barkov <bar@mariadb.com> | 2022-09-14 15:00:09 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2022-09-14 16:24:51 +0400 |
| commit | fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885 (patch) | |
| tree | 0bd937aed2faa10b09c0b47884dad4a8e1d5d57c /mysql-test/suite/maria/maria-gis-rtree.result | |
| parent | fb70bb44d096f4117e9454740aa4fa0651a1a69e (diff) | |
| parent | 289105e282fb5f7865bb7ddb6226149ac5bdf2b8 (diff) | |
| download | mariadb-git-fe844c16b6cbd67386d1b9fc1cb9e5a656bbb885.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'mysql-test/suite/maria/maria-gis-rtree.result')
| -rw-r--r-- | mysql-test/suite/maria/maria-gis-rtree.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/maria/maria-gis-rtree.result b/mysql-test/suite/maria/maria-gis-rtree.result index 9267556bc4b..cf189d13415 100644 --- a/mysql-test/suite/maria/maria-gis-rtree.result +++ b/mysql-test/suite/maria/maria-gis-rtree.result @@ -12,7 +12,7 @@ t1 CREATE TABLE `t1` ( `g` geometry NOT NULL, PRIMARY KEY (`fid`), SPATIAL KEY `g` (`g`) -) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0 +) ENGINE=Aria DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(150 150, 150 150)')); INSERT INTO t1 (g) VALUES (GeomFromText('LineString(149 149, 151 151)')); INSERT INTO t1 (g) VALUES (GeomFromText('LineString(148 148, 152 152)')); @@ -295,7 +295,7 @@ t2 CREATE TABLE `t2` ( `g` geometry NOT NULL, PRIMARY KEY (`fid`), SPATIAL KEY `g` (`g`) -) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0 +) ENGINE=Aria AUTO_INCREMENT=101 DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci PAGE_CHECKSUM=1 ROW_FORMAT=PAGE TRANSACTIONAL=0 SELECT count(*) FROM t2; count(*) 100 |