Merge 10.3 into 10.4

1 files changed, 103 insertions, 103 deletions

diff --git a/mysql-test/main/gis.result b/mysql-test/main/gis.result
index 1e7f7ce931d..e18d2a30056 100644
--- a/mysql-test/main/gis.result
+++ b/mysql-test/main/gis.result
@@ -610,7 +610,7 @@ show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `GeomFromWKB(POINT(1,3))` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 drop table t1;
 CREATE TABLE `t1` (`object_id` bigint(20) unsigned NOT NULL default '0', `geo`
 geometry NOT NULL default '') ENGINE=MyISAM ;
@@ -1759,7 +1759,7 @@ GEOMETRY_COLUMNS	CREATE TEMPORARY TABLE `GEOMETRY_COLUMNS` (
   `COORD_DIMENSION` tinyint(2) NOT NULL,
   `MAX_PPR` tinyint(2) NOT NULL,
   `SRID` smallint(5) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
 SHOW CREATE TABLE information_schema.spatial_ref_sys;
 Table	Create Table
 SPATIAL_REF_SYS	CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
@@ -1767,7 +1767,7 @@ SPATIAL_REF_SYS	CREATE TEMPORARY TABLE `SPATIAL_REF_SYS` (
   `AUTH_NAME` varchar(512) NOT NULL,
   `AUTH_SRID` int(5) NOT NULL,
   `SRTEXT` varchar(2048) NOT NULL
-) ENGINE=MEMORY DEFAULT CHARSET=utf8
+) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
 create table t1(g GEOMETRY, pt POINT);
 create table t2(g LINESTRING, pl POLYGON);
 select * from information_schema.geometry_columns where f_table_schema='test';
@@ -1791,7 +1791,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `CONTAINS(NULL, NULL)` int(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 #
 # MDEV-7334 valgrind warning "unitialized bytes" in 10.1.
@@ -1867,7 +1867,7 @@ Table	Create Table
 t2	CREATE TABLE `t2` (
   `w1` int(1) DEFAULT NULL,
   `w2` int(1) DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1,t2;
 CREATE TABLE t1 (
 id INT UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -1904,7 +1904,7 @@ t1	CREATE TABLE `t1` (
   `a` point DEFAULT NULL,
   `x` double DEFAULT st_x(`a`),
   `y` double DEFAULT st_y(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Point(1,2));
 SELECT x,y FROM t1;
 x	y
@@ -1916,7 +1916,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` geometry DEFAULT NULL,
   `area` double DEFAULT st_area(`g`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (g) VALUES (GeomFromText('POLYGON((0 0,20 0,20 20,0 20,0 0))'));
 SELECT area FROM t1;
 area
@@ -1928,7 +1928,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` geometry DEFAULT NULL,
   `length` double DEFAULT st_length(`g`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (g) VALUES (GeomFromText('LINESTRING(0 0,20 0,20 20,0 20,0 0)'));
 SELECT length FROM t1;
 length
@@ -1940,7 +1940,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` point DEFAULT NULL,
   `distance` double DEFAULT st_distance(`g`,point(0,0))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (g) VALUES (Point(1,0));
 SELECT distance FROM t1;
 distance
@@ -1952,7 +1952,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` text DEFAULT NULL,
   `g` geometry DEFAULT st_geometryfromtext(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES ('point(1 1)');
 SELECT AsText(g) FROM t1;
 AsText(g)
@@ -1965,7 +1965,7 @@ t1	CREATE TABLE `t1` (
   `x` int(11) DEFAULT NULL,
   `y` int(11) DEFAULT NULL,
   `g` geometry DEFAULT point(`x`,`y`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (x,y) VALUES (10,20);
 SELECT AsText(g) FROM t1;
 AsText(g)
@@ -1977,7 +1977,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_pointn(`a`,2)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('LineString(1 1,2 2,3 3)'));
 SELECT AsText(b) FROM t1;
 AsText(b)
@@ -1989,7 +1989,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_startpoint(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('LineString(1 1,2 2,3 3)'));
 SELECT AsText(b) FROM t1;
 AsText(b)
@@ -2002,7 +2002,7 @@ t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT NULL,
   `c` geometry DEFAULT geometrycollection(`a`,`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a,b) VALUES (Point(1,1), Point(2,2));
 SELECT AsText(c) FROM t1;
 AsText(c)
@@ -2014,7 +2014,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_geometryfromwkb(st_aswkb(`a`),20)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('POINT(1 1)', 10));
 SELECT AsText(a), SRID(a), AsText(b), SRID(b) FROM t1;
 AsText(a)	SRID(a)	AsText(b)	SRID(b)
@@ -2026,7 +2026,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_boundary(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('POLYGON((10 10, 10 20, 20 20, 20 10, 10 10))'));
 SELECT AsText(b) FROM t1;
 AsText(b)
@@ -2038,7 +2038,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_buffer(`a`,10)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('POLYGON((10 10, 10 20, 20 20, 20 10, 10 10))'));
 SELECT GeometryType(b) FROM t1;
 GeometryType(b)
@@ -2050,7 +2050,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_centroid(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('POLYGON((10 10, 10 20, 20 20, 20 10, 10 10))'));
 SELECT AsText(b) FROM t1;
 AsText(b)
@@ -2062,7 +2062,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_envelope(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('LineString(1 1,4 4)'));
 SELECT AsText(b) FROM t1;
 AsText(b)
@@ -2074,7 +2074,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT st_pointonsurface(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('POLYGON((10 10, 10 20, 20 20, 20 10, 10 10))'));
 SELECT GeometryType(b) FROM t1;
 GeometryType(b)
@@ -2087,7 +2087,7 @@ t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT point(1,1),
   `c` geometry DEFAULT st_union(`a`,`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Point(0,0));
 SELECT AsText(c) FROM t1;
 AsText(c)
@@ -2099,7 +2099,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` varchar(20) DEFAULT st_geometrytype(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Point(0, 0));
 SELECT b FROM t1;
 b
@@ -2111,7 +2111,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_issimple(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Point(0, 0));
 SELECT b FROM t1;
 b
@@ -2123,7 +2123,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_isempty(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Point(0, 0));
 SELECT b FROM t1;
 b
@@ -2135,7 +2135,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_isring(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('LineString(0 0,0 1,1 1,1 0,0 0)'));
 SELECT b FROM t1;
 b
@@ -2147,7 +2147,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_isclosed(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('LineString(0 0,0 1,1 1,1 0,0 0)'));
 SELECT b FROM t1;
 b
@@ -2159,7 +2159,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_dimension(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (Buffer(Point(1,1),1));
 SELECT b FROM t1;
 b
@@ -2171,7 +2171,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_numgeometries(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (ST_UNION(Point(1,1),Point(0,0)));
 SELECT b FROM t1;
 b
@@ -2183,7 +2183,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_numinteriorrings(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))'));
 SELECT b FROM t1;
 b
@@ -2195,7 +2195,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT st_numpoints(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (LineString(Point(1,1),Point(0,0)));
 SELECT b FROM t1;
 b
@@ -2207,7 +2207,7 @@ Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` int(11) DEFAULT srid(`a`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a) VALUES (GeomFromText('Point(1 1)', 100));
 SELECT b FROM t1;
 b
@@ -2220,7 +2220,7 @@ t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT NULL,
   `c` int(11) DEFAULT mbrdisjoint(`a`,`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a,b) VALUES (Point(1,1),Point(1,1));
 SELECT c FROM t1;
 c
@@ -2233,7 +2233,7 @@ t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT NULL,
   `c` int(11) DEFAULT st_disjoint(`a`,`b`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a,b) VALUES (Point(1,1),Point(1,1));
 SELECT c FROM t1;
 c
@@ -2246,7 +2246,7 @@ t1	CREATE TABLE `t1` (
   `a` geometry DEFAULT NULL,
   `b` geometry DEFAULT NULL,
   `c` int(11) DEFAULT st_relate(`a`,`b`,'T*F**FFF*')
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 INSERT INTO t1 (a,b) VALUES (Point(1,1),Point(1,1));
 SELECT c FROM t1;
 c
@@ -2315,31 +2315,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a VARCHAR(10), b Point)
 
@@ -2347,31 +2347,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TINYTEXT, b Point)
 
@@ -2379,31 +2379,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TEXT, b Point)
 
@@ -2411,31 +2411,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a MEDIUMTEXT, b Point)
 
@@ -2443,31 +2443,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a LONGTEXT, b Point)
 
@@ -2475,31 +2475,31 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TINYINT, b Point)
 
@@ -2816,25 +2816,25 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 ERROR: 
@@ -2846,25 +2846,25 @@ CREATE TABLE t2 AS SELECT CASE WHEN TRUE THEN a ELSE b END FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `CASE WHEN TRUE THEN a ELSE b END` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT COALESCE(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `COALESCE(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IF(TRUE,a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IF(TRUE,a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT IFNULL(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `IFNULL(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 
 CREATE TABLE t2 AS SELECT a FROM t1 UNION SELECT b FROM t1
 ERROR: 
@@ -2874,14 +2874,14 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `COALESCE(NULL, Point(1,1))` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT NULL UNION SELECT Point(1,1);
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `NULL` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
@@ -3823,7 +3823,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a VARCHAR(10), b Point)
 
@@ -3831,7 +3831,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TINYTEXT, b Point)
 
@@ -3839,7 +3839,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TEXT, b Point)
 
@@ -3847,7 +3847,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a MEDIUMTEXT, b Point)
 
@@ -3855,7 +3855,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a LONGTEXT, b Point)
 
@@ -3863,7 +3863,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a TINYINT, b Point)
 
@@ -3956,7 +3956,7 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 -------------------------------------
 CREATE TABLE t1 (a SET(0x61), b Point)
 
@@ -3964,13 +3964,13 @@ CREATE TABLE t2 AS SELECT LEAST(a,b) FROM t1
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `LEAST(a,b)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CREATE TABLE t1 AS SELECT LEAST(NULL, Point(1,1));
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `LEAST(NULL, Point(1,1))` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 DROP PROCEDURE p1;
 DROP PROCEDURE p2;
@@ -4215,14 +4215,14 @@ t1	CREATE TABLE `t1` (
   `p0` point DEFAULT NULL,
   `p1` point DEFAULT NULL,
   `p2` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1 AS SELECT LEAST(Point(0,0),Point(0,0)) AS p1;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `p1` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE TABLE t1 (
 c_geometry GEOMETRY,
@@ -4255,7 +4255,7 @@ t2	CREATE TABLE `t2` (
   `COALESCE(NULL, c_multilinestring)` multilinestring DEFAULT NULL,
   `COALESCE(NULL, c_multipolygon)` multipolygon DEFAULT NULL,
   `COALESCE(NULL, c_geometrycollection)` geometrycollection DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 COALESCE(c_geometry, NULL),
@@ -4278,7 +4278,7 @@ t2	CREATE TABLE `t2` (
   `COALESCE(c_multilinestring, NULL)` multilinestring DEFAULT NULL,
   `COALESCE(c_multipolygon, NULL)` multipolygon DEFAULT NULL,
   `COALESCE(c_geometrycollection, NULL)` geometrycollection DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT
 COALESCE(c_geometry, c_geometry),
@@ -4301,7 +4301,7 @@ t2	CREATE TABLE `t2` (
   `COALESCE(c_multilinestring, c_multilinestring)` multilinestring DEFAULT NULL,
   `COALESCE(c_multipolygon, c_multipolygon)` multipolygon DEFAULT NULL,
   `COALESCE(c_geometrycollection, c_geometrycollection)` geometrycollection DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t2;
 DROP TABLE t1;
 #
@@ -4312,7 +4312,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `c1` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 CREATE PROCEDURE p1(name TEXT)
 BEGIN
@@ -4331,56 +4331,56 @@ t2	CREATE TABLE `t2` (
   `a1` geometry DEFAULT NULL,
   `a2` geometry DEFAULT NULL,
   `a3` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('point');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` point DEFAULT NULL,
   `a2` point DEFAULT NULL,
   `a3` point DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('linestring');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` linestring DEFAULT NULL,
   `a2` linestring DEFAULT NULL,
   `a3` linestring DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('polygon');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` polygon DEFAULT NULL,
   `a2` polygon DEFAULT NULL,
   `a3` polygon DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('multipoint');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` multipoint DEFAULT NULL,
   `a2` multipoint DEFAULT NULL,
   `a3` multipoint DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('multilinestring');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` multilinestring DEFAULT NULL,
   `a2` multilinestring DEFAULT NULL,
   `a3` multilinestring DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('multipolygon');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` multipolygon DEFAULT NULL,
   `a2` multipolygon DEFAULT NULL,
   `a3` multipolygon DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 CALL p1('geometrycollection');
 Table	Create Table
 t2	CREATE TABLE `t2` (
   `a1` geometrycollection DEFAULT NULL,
   `a2` geometrycollection DEFAULT NULL,
   `a3` geometrycollection DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP PROCEDURE p1;
 #
 # MDEV-12798 Item_param does not preserve exact field type in EXECUTE IMMEDIATE 'CREATE TABLE AS SELECT ?' USING POINT(1,1)
@@ -4390,7 +4390,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `?` point NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 PREPARE stmt FROM 'CREATE OR REPLACE TABLE t1 AS SELECT ?';
 EXECUTE stmt USING POINT(1,1);
@@ -4398,7 +4398,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `?` point NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 #
 # MDEV-12854 Synchronize CREATE..SELECT data type and result set metadata data type for INT functions
@@ -4455,7 +4455,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` polygon DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT ST_ASTEXT(g) FROM t1;
 ST_ASTEXT(g)
 POLYGON((1 1,1 1,1 1,1 1,1 1))
@@ -4471,7 +4471,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT ST_GEOMETRYTYPE(g) FROM t1;
 ST_GEOMETRYTYPE(g)
 POINT
@@ -4522,7 +4522,7 @@ SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `g` geometry DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 SELECT ST_ASTEXT(g), SRID(g) FROM t1;
 ST_ASTEXT(g)	SRID(g)
 POINT(1 1)	1
@@ -5016,7 +5016,7 @@ t1	CREATE TABLE `t1` (
   `COALESCE(POINT(1,1),0x60)` longblob DEFAULT NULL,
   `LEAST(0x60,POINT(1,1))` longblob DEFAULT NULL,
   `LEAST(POINT(1,1),0x60)` longblob DEFAULT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
 DROP TABLE t1;
 SELECT 0x60+POINT(1,1);
 ERROR HY000: Illegal parameter data types bigint and geometry for operation '+'