Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Conflicts:
	mysql-test/r/cte_nonrecursive.result
	mysql-test/suite/galera/r/galera_bf_abort.result
	mysql-test/suite/galera/r/galera_bf_abort_get_lock.result
	mysql-test/suite/galera/r/galera_bf_abort_sleep.result
	mysql-test/suite/galera/r/galera_enum.result
	mysql-test/suite/galera/r/galera_fk_conflict.result
	mysql-test/suite/galera/r/galera_insert_multi.result
	mysql-test/suite/galera/r/galera_many_indexes.result
	mysql-test/suite/galera/r/galera_mdl_race.result
	mysql-test/suite/galera/r/galera_nopk_bit.result
	mysql-test/suite/galera/r/galera_nopk_blob.result
	mysql-test/suite/galera/r/galera_nopk_large_varchar.result
	mysql-test/suite/galera/r/galera_nopk_unicode.result
	mysql-test/suite/galera/r/galera_pk_bigint_signed.result
	mysql-test/suite/galera/r/galera_pk_bigint_unsigned.result
	mysql-test/suite/galera/r/galera_serializable.result
	mysql-test/suite/galera/r/galera_toi_drop_database.result
	mysql-test/suite/galera/r/galera_toi_lock_exclusive.result
	mysql-test/suite/galera/r/galera_toi_truncate.result
	mysql-test/suite/galera/r/galera_unicode_pk.result
	mysql-test/suite/galera/r/galera_var_auto_inc_control_off.result
	mysql-test/suite/galera/r/galera_wsrep_log_conficts.result
	sql/field.cc
	sql/rpl_gtid.cc
	sql/share/errmsg-utf8.txt
	sql/sql_acl.cc
	sql/sql_parse.cc
	sql/sql_partition_admin.cc
	sql/sql_prepare.cc
	sql/sql_repl.cc
	sql/sql_table.cc
	sql/sql_yacc.yy

1 files changed, 22 insertions, 28 deletions

diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/t/gis-rtree.test
index 976398359c6..41388090427 100644
--- a/mysql-test/t/gis-rtree.test
+++ b/mysql-test/t/gis-rtree.test
@@ -3,15 +3,12 @@
 #
 # test of rtree (using with spatial data)
 #
---disable_warnings
-DROP TABLE IF EXISTS t1, t2;
---enable_warnings
 
 CREATE TABLE t1 (
-  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   g GEOMETRY NOT NULL,
   SPATIAL KEY(g)
-) ENGINE=MyISAM;
+);
 
 SHOW CREATE TABLE t1;
 
@@ -31,9 +28,9 @@ SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160
 DROP TABLE t1;
 
 CREATE TABLE t2 (
-  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   g GEOMETRY NOT NULL
-) ENGINE=MyISAM;
+);
 
 let $1=10;
 while ($1)
@@ -50,9 +47,9 @@ while ($1)
 ALTER TABLE t2 ADD SPATIAL KEY(g);
 SHOW CREATE TABLE t2;
 SELECT count(*) FROM t2;
-EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
+EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g,
   GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
-SELECT fid, AsText(g) FROM t2 WHERE Within(g, 
+SELECT fid, AsText(g) FROM t2 WHERE Within(g,
   GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));
 
 let $1=10;
@@ -70,7 +67,6 @@ while ($1)
 
 DROP TABLE t2;
 
-drop table if exists t1;
 CREATE TABLE t1 (a geometry NOT NULL, SPATIAL (a));
 INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)"));
 INSERT INTO t1 VALUES (GeomFromText("LINESTRING(100 100, 200 200, 300 300)"));
@@ -110,10 +106,10 @@ drop table t1;
 #
 
 CREATE TABLE t1 (
-  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, 
+  fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
   g GEOMETRY NOT NULL,
   SPATIAL KEY(g)
-) ENGINE=MyISAM;
+);
 
 INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)'));
 #select * from t1 where g<GeomFromText('LineString(1 2, 2 3)');
@@ -125,12 +121,10 @@ CREATE TABLE t1 (
   name VARCHAR(32),
 
   SPATIAL KEY (line)
-
-
-) engine=myisam;
+);
 
 ALTER TABLE t1 DISABLE KEYS;
-INSERT INTO t1 (name, kind, line) VALUES 
+INSERT INTO t1 (name, kind, line) VALUES
   ("Aadaouane", "pp", GeomFromText("POINT(32.816667 35.983333)")),
   ("Aadassiye", "pp", GeomFromText("POINT(35.816667 36.216667)")),
   ("Aadbel", "pp", GeomFromText("POINT(34.533333 36.100000)")),
@@ -172,7 +166,7 @@ CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom));
 INSERT IGNORE INTO t2 SELECT GeomFromText(st) FROM t1;
 drop table t1, t2;
 
-CREATE TABLE t1 (`geometry` geometry NOT NULL default '',SPATIAL KEY `gndx` (`geometry`)) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+CREATE TABLE t1 (`geometry` geometry NOT NULL default '',SPATIAL KEY `gndx` (`geometry`)) DEFAULT CHARSET=latin1;
 
 INSERT INTO t1 (geometry) VALUES
 (PolygonFromText('POLYGON((-18.6086111000 -66.9327777000, -18.6055555000
@@ -193,7 +187,7 @@ drop table t1;
 CREATE TABLE t1 (
   c1 geometry NOT NULL default '',
   SPATIAL KEY i1 (c1)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) DEFAULT CHARSET=latin1;
 INSERT INTO t1 (c1) VALUES (
   PolygonFromText('POLYGON((-18.6086111000 -66.9327777000,
                             -18.6055555000 -66.8158332999,
@@ -207,7 +201,7 @@ DROP TABLE t1;
 CREATE TABLE t1 (
   c1 geometry NOT NULL default '',
   SPATIAL KEY i1 (c1)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) DEFAULT CHARSET=latin1;
 INSERT INTO t1 (c1) VALUES (
   PolygonFromText('POLYGON((-18.6086111000 -66.9327777000,
                             -18.6055555000 -66.8158332999,
@@ -252,7 +246,7 @@ CREATE TABLE t1 (id bigint(12) unsigned NOT NULL auto_increment,
   spatial_point point NOT NULL,
   PRIMARY KEY(id),
   SPATIAL KEY (spatial_point)
-  )ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
+  ) DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 #
 INSERT INTO t1 (c2, c1, c3, spatial_point) VALUES
   ('y', 's', 'j', GeomFromText('POINT(167 74)')),
@@ -848,7 +842,7 @@ INSERT INTO t1(foo) VALUES ('');
 DROP TABLE t1;
 
 #
-# Bug #23578: Corruption prevents Optimize table from working properly with a 
+# Bug #23578: Corruption prevents Optimize table from working properly with a
 #             spatial index
 #
 
@@ -931,12 +925,12 @@ DROP TABLE t1;
 
 
 --echo #
---echo # Bug #57323/11764487: myisam corruption with insert ignore 
+--echo # Bug #57323/11764487: myisam corruption with insert ignore
 --echo # and invalid spatial data
 --echo #
 
 CREATE TABLE t1(a POINT NOT NULL, b GEOMETRY NOT NULL,
-  SPATIAL KEY(a), SPATIAL KEY(b)) ENGINE=MyISAM;
+  SPATIAL KEY(a), SPATIAL KEY(b));
 INSERT INTO t1 VALUES(GEOMFROMTEXT("point (0 0)"), GEOMFROMTEXT("point (1 1)"));
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 INSERT IGNORE INTO t1 SET a=GEOMFROMTEXT("point (-6 0)"), b=GEOMFROMTEXT("error");
@@ -946,7 +940,7 @@ SELECT ASTEXT(a), ASTEXT(b) FROM t1;
 DROP TABLE t1;
 
 CREATE TABLE t1(a INT NOT NULL, b GEOMETRY NOT NULL,
-  KEY(a), SPATIAL KEY(b)) ENGINE=MyISAM;
+  KEY(a), SPATIAL KEY(b));
 INSERT INTO t1 VALUES(0, GEOMFROMTEXT("point (1 1)"));
 --error ER_CANT_CREATE_GEOMETRY_OBJECT
 INSERT IGNORE INTO t1 SET a=0, b=GEOMFROMTEXT("error");
@@ -959,11 +953,11 @@ DROP TABLE t1;
 
 #
 # MDEV-4521 MBRContains, MBRWithin no longer work with geometries of different type.
-# 
+#
 CREATE TABLE t1 (
   l LINESTRING NOT NULL,
   SPATIAL KEY(l)
-) ENGINE = myisam;
+);
 
 INSERT INTO t1 VALUES(GeomFromText('LINESTRING(0 0, 1 1)'));
 INSERT INTO t1 VALUES(GeomFromText('LINESTRING(1 1, 2 2)'));
@@ -985,7 +979,7 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-8239 Reverse spatial operations OP(const, field) do not get optimized
 --echo #
-CREATE TABLE t1 (a GEOMETRY NOT NULL, SPATIAL KEY(a)) ENGINE=MyISAM;
+CREATE TABLE t1 (a GEOMETRY NOT NULL, SPATIAL KEY(a));
 INSERT INTO t1 VALUES (Point(1,2)),(Point(1,3));
 EXPLAIN SELECT * FROM t1 WHERE MBRINTERSECTS(a,Point(1,2));
 EXPLAIN SELECT * FROM t1 WHERE ST_INTERSECTS(a,Point(1,2));
@@ -996,7 +990,7 @@ DROP TABLE t1;
 --echo #
 --echo # MDEV-8610 "WHERE CONTAINS(indexed_geometry_column,1)" causes full table scan
 --echo #
-CREATE TABLE t1  (a GEOMETRY NOT NULL, SPATIAL KEY(a)) ENGINE=MyISAM;
+CREATE TABLE t1  (a GEOMETRY NOT NULL, SPATIAL KEY(a));
 INSERT INTO t1 VALUES (Point(1,1)),(Point(2,2)),(Point(3,3));
 --error ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION
 EXPLAIN SELECT * FROM t1 WHERE CONTAINS(a,1);