diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-20 16:53:20 +0300 |
| commit | 44fd2c4b24b35cdb5f573395fe07800d05b7c8b6 (patch) | |
| tree | 13c130d521c7c1dea3bc9b8b26d9057a1c268668 /mysql-test/main/gis-debug.result | |
| parent | 5d9d379329abcbb661ed6c027efbb9fd763958c6 (diff) | |
| parent | 0792aff161132fb953510555fe45544991dec95d (diff) | |
| download | mariadb-git-44fd2c4b24b35cdb5f573395fe07800d05b7c8b6.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/gis-debug.result')
| -rw-r--r-- | mysql-test/main/gis-debug.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/gis-debug.result b/mysql-test/main/gis-debug.result index f490a720ecf..7d143ad3f45 100644 --- a/mysql-test/main/gis-debug.result +++ b/mysql-test/main/gis-debug.result @@ -380,7 +380,7 @@ t1 CREATE TABLE `t1` ( `POINT(0,0)*'0'` tinytext DEFAULT NULL, `POINT(0,0)/'0'` tinytext DEFAULT NULL, `POINT(0,0) MOD '0'` tinytext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 AS SELECT '0'+POINT(0,0), @@ -390,7 +390,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `'0'+POINT(0,0)` tinytext DEFAULT NULL, `'0'*POINT(0,0)` tinytext DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; CREATE TABLE t1 AS SELECT '0'-POINT(0,0) LIMIT 0; ERROR HY000: Illegal parameter data types varchar and point for operation '-' |