MariaDB adjustments to innodb_gis tests.

Some test are still disabled as they provide different results,
fail on different error or crash.

Fixes also MDEV-14060 InnoDB: Foreign key constraint to
geometry type does not work where test intentionally tried
incorrect cases.

mysql-test/include/kill_and_restart_mysqld.inc

+if (!$restart_parameters)
+{
+  let $restart_parameters = restart;
+}
+
+--let $_server_id= `SELECT @@server_id`
+--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
+
+--echo # Kill and $restart_parameters
+--exec echo "$restart_parameters" > $_expect_file_name
+--shutdown_server 0
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+--disable_reconnect

mysql-test/include/wait_innodb_all_purged.inc

+# include/wait_innodb_all_purged.inc
+#
+# SUMMARY
+#
+#    Waits until purged all undo records of innodb, or operation times out.
+#
+# USAGE
+#
+#    --source include/wait_innodb_all_purged.inc
+#
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--disable_query_log
+
+let $wait_counter_init= 300;
+if ($wait_timeout)
+{
+  let $wait_counter_init= `SELECT $wait_timeout * 10`;
+}
+# Reset $wait_timeout so that its value won't be used on subsequent
+# calls, and default will be used instead.
+let $wait_timeout= 0;
+
+let $wait_counter= $wait_counter_init;
+
+# Keep track of how many times the wait condition is tested
+let $wait_condition_reps= 0;
+let $prev_trx_age= 0;
+while ($wait_counter)
+{
+--disable_warnings
+    let $trx_age = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS
+WHERE VARIABLE_NAME = 'INNODB_PURGE_TRX_ID_AGE';`;
+--enable_warnings
+
+    if ($trx_age != $prev_trx_age)
+    {
+        let $wait_counter= $wait_counter_init;
+        let $prev_trx_age= $trx_age;
+    }
+
+    let $success= `SELECT $trx_age < 1`;
+    inc $wait_condition_reps;
+    if ($success)
+    {
+        let $wait_counter= 0;
+    }
+    if (!$success)
+    {
+        real_sleep 0.1;
+        dec $wait_counter;
+    }
+}
+if (!$success)
+{
+  echo Timeout in wait_innodb_all_purged.inc for INNODB_PURGE_TRX_ID_AGE = $trx_age;
+}
+
+--enable_query_log

mysql-test/suite/innodb_gis/disabled.def

+##############################################################################
+#
+#  List the test cases that are to be disabled temporarily.
+#
+#  Separate the test case name and the comment with ':'.
+#
+#    <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment>
+#
+#  Do not use any TAB characters for whitespace.
+#
+##############################################################################
+
+gis_split_inf : MDEV-14057 InnoDB GIS tests fail
+row_format : MDEV-14057 InnoDB GIS tests fail
+rtree_estimate : MDEV-14057 InnoDB GIS tests fail
+rtree_multi_pk : MDEV-14057 InnoDB GIS tests fail
+rtree_recovery : MDEV-14058 InnoDB Assertion failure !leaf on rem0rec.cc line 566 on test innodb_gis.rtree_recovery
+tree_search : MDEV-14057 InnoDB GIS tests fail
+rtree_concurrent_srch: MDEV-14059 InnoDB assertion failure offset >= ((38U + 36 + 2 * 10) + 5) at page0page.h line 318
+point_big : MDEV-14057 InnoDB GIS tests fail
+geometry : MDEV-14057 InnoDB GIS tests fail
+bug17057168 : MDEV-14057 InnoDB GIS tests fail
+bug16236208 : MDEV-14057 InnoDB GIS tests fail
+bug16266012 : MDEV-14057 InnoDB GIS tests fail
+rtree_search : MDEV-14057 InnoDB GIS tests fail
+rtree_old : MDEV-14057 InnoDB GIS tests fail

mysql-test/suite/innodb_gis/r/kill_server.result

@@ -32,7 +32,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 truncate table t1;
-call mtr.add_suppression("InnoDB: page [0-9]+ in the doublewrite buffer is not within space bounds.*");
+call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page number=[0-9]+\] in the doublewrite buffer slot [0-9]+ is not within space bounds");
 START TRANSACTION;
 CALL insert_t1(5000);
 COMMIT;

mysql-test/suite/innodb_gis/r/repeatable_spatial.result

@@ -16,6 +16,8 @@ SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
 "In connection 1"
+connect  con1,localhost,root,,;
+connection con1;
 SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
 SELECT @@tx_isolation;
 @@tx_isolation
@@ -27,6 +29,8 @@ SELECT c1,ST_AsText(c2),ST_AsText(c3),ST_AsText(c4),ST_AsText(c5) FROM tab;
 c1	ST_AsText(c2)	ST_AsText(c3)	ST_AsText(c4)	ST_AsText(c5)
 1	POINT(10 10)	LINESTRING(5 5,20 20,30 30)	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))
 "In connection 2"
+connect  con2,localhost,root,,;
+connection con2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT @@tx_isolation;
 @@tx_isolation
@@ -41,6 +45,7 @@ SET @g2 = ST_GeomFromText('POINT(10 10)');
 UPDATE tab SET C5 = ST_GeomFromText('POLYGON((300 300,400 400,500 500,300 500,300 400,300 300))')
 WHERE MBREquals(tab.c4, @g1) AND MBREquals(tab.c2, @g2);
 "In connection 1"
+connection con1;
 SET @g3 = ST_GeomFromText('POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))');
 SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab WHERE MBREquals(tab.c5, @g3);
 c1	ST_AsText(c2)	ST_AsText(c4)	ST_AsText(c5)
@@ -52,11 +57,14 @@ SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
 "In connection 2"
+connection con2;
 SELECT COUNT(*) FROM tab;
 COUNT(*)
 2
 COMMIT;
+disconnect con2;
 "In connection 1"
+connection con1;
 SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
@@ -74,6 +82,8 @@ SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab;
 c1	ST_AsText(c2)	ST_AsText(c4)	ST_AsText(c5)
 1	POINT(10 10)	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))	POLYGON((300 300,400 400,500 500,300 500,300 400,300 300))
 2	POINT(20 20)	POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))	POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))
+disconnect con1;
+connection default;
 DROP TABLE tab;
 CREATE TABLE tab(c1 int NOT NULL PRIMARY KEY,c2 POINT NOT NULL,
 c3 LINESTRING NOT NULL,c4 POLYGON NOT NULL,c5 GEOMETRY NOT NULL) 
@@ -93,6 +103,8 @@ SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
 "In connection 1"
+connect  con1,localhost,root,,;
+connection con1;
 SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
 SELECT @@tx_isolation;
 @@tx_isolation
@@ -104,6 +116,8 @@ SELECT c1,ST_AsText(c2),ST_AsText(c3),ST_AsText(c4),ST_AsText(c5) FROM tab;
 c1	ST_AsText(c2)	ST_AsText(c3)	ST_AsText(c4)	ST_AsText(c5)
 1	POINT(10 10)	LINESTRING(5 5,20 20,30 30)	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))
 "In connection 2"
+connect  con2,localhost,root,,;
+connection con2;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 SELECT @@tx_isolation;
 @@tx_isolation
@@ -118,6 +132,7 @@ SET @g2 = ST_GeomFromText('POINT(10 10)');
 UPDATE tab SET C5 = ST_GeomFromText('POLYGON((300 300,400 400,500 500,300 500,300 400,300 300))')
 WHERE MBREquals(tab.c4, @g1) AND MBREquals(tab.c2, @g2);
 "In connection 1"
+connection con1;
 SET @g3 = ST_GeomFromText('POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))');
 SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab WHERE MBREquals(tab.c5, @g3);
 c1	ST_AsText(c2)	ST_AsText(c4)	ST_AsText(c5)
@@ -129,11 +144,14 @@ SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
 "In connection 2"
+connection con2;
 SELECT COUNT(*) FROM tab;
 COUNT(*)
 2
 COMMIT;
+disconnect con2;
 "In connection 1"
+connection con1;
 SELECT COUNT(*) FROM tab;
 COUNT(*)
 1
@@ -151,4 +169,6 @@ SELECT c1,ST_AsText(c2),ST_AsText(c4),ST_AsText(c5) FROM tab;
 c1	ST_AsText(c2)	ST_AsText(c4)	ST_AsText(c5)
 1	POINT(10 10)	POLYGON((30 30,40 40,50 50,30 50,30 40,30 30))	POLYGON((300 300,400 400,500 500,300 500,300 400,300 300))
 2	POINT(20 20)	POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))	POLYGON((40 50,40 70,50 100,70 100,80 80,70 50,40 50))
+disconnect con1;
+connection default;
 DROP TABLE tab;

mysql-test/suite/innodb_gis/r/rollback.result

@@ -410,6 +410,8 @@ update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3;
 ERROR 23000: Duplicate entry '5' for key 'c'
 rollback;
 set session debug="+d,row_mysql_crash_if_error";
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 update t1 set a=point(5,5), b=point(5,5), c=5 where i < 3;
 ERROR HY000: Lost connection to MySQL server during query
 insert into t1 values(5, point(5,5), point(5,5), 5);

mysql-test/suite/innodb_gis/r/rtree_compress.result

@@ -40,8 +40,12 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
 count(*)
 0
 SET DEBUG='+d,page_copy_rec_list_start_compress_fail';
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 delete from t1;
 SET DEBUG='-d,page_copy_rec_list_start_compress_fail';
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 select count(*) from t1 where MBRWithin(t1.c2, @g1);
 count(*)
 0

mysql-test/suite/innodb_gis/r/rtree_compress2.result

@@ -16,7 +16,7 @@ check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 truncate table t1;
-call mtr.add_suppression("InnoDB: page [0-9]+ in the doublewrite buffer is not within space bounds.*");
+call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page number=[0-9]+\] in the doublewrite buffer slot [0-9]+ is not within space bounds");
 START TRANSACTION;
 CALL insert_t1(5000);
 COMMIT;

mysql-test/suite/innodb_gis/r/rtree_create_inplace.result

@@ -31,5 +31,7 @@ COUNT(*)
 0
 ALTER TABLE t1 DROP INDEX idx, ADD SPATIAL INDEX idx3(c2);
 SET SESSION debug="+d,row_merge_instrument_log_check_flush";
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 ALTER TABLE t1  DROP INDEX idx3, ADD SPATIAL INDEX idx4(c2), ADD SPATIAL INDEX idx5(c3);
 DROP TABLE t1;

mysql-test/suite/innodb_gis/r/rtree_debug.result

@@ -39,9 +39,13 @@ t1	CREATE TABLE `t1` (
   SPATIAL KEY `idx` (`c2`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 SET DEBUG='+d,row_merge_ins_spatial_fail';
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 create spatial index idx2 on t1(c2);
-ERROR HY000: Got error 1000 from storage engine
+ERROR HY000: Got error 1000 "Unknown error 1000" from storage engine InnoDB
 SET DEBUG='-d,row_merge_ins_spatial_fail';
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/innodb_gis/r/rtree_purge.result

@@ -19,5 +19,6 @@ set n:=n+1;
 until n >= i end repeat;
 end|
 call p(200);
+InnoDB		0 transactions not purged
 drop procedure p;
 drop table t;

mysql-test/suite/innodb_gis/r/types.result

 SET SESSION debug="+d,row_print_geometry_data";
+Warnings:
+Warning	1287	'@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
 CREATE TABLE t_wl6455 ( i INT, g GEOMETRY NOT NULL) ENGINE=InnoDB;
 SHOW CREATE TABLE t_wl6455;
 Table	Create Table
@@ -24,7 +26,7 @@ SELECT ST_AsText(g) FROM t_wl6455;
 ST_AsText(g)
 POINT(1 1)
 POINT(2 2)
-MULTIPOINT((0 0),(20 20),(60 60))
+MULTIPOINT(0 0,20 20,60 60)
 LINESTRING(1 1,4 4)
 LINESTRING(2 2,5 5)
 MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5))
@@ -33,10 +35,8 @@ MULTIPOLYGON(((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1)))
 GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(2 2,3 3))
 CREATE INDEX i_p ON t_wl6455 (g(10));
 EXPLAIN SELECT ST_AsText(g) FROM t_wl6455 WHERE g = POINT(2,2);
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t_wl6455	NULL	ref	i_p	i_p	12	const	#	100.00	Using where
-Warnings:
-Note	1003	/* select#1 */ select st_astext(`test`.`t_wl6455`.`g`) AS `ST_AsText(g)` from `test`.`t_wl6455` where (`test`.`t_wl6455`.`g` = <cache>(point(2,2)))
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t_wl6455	ref	i_p	i_p	12	const	2	#
 SELECT ST_AsText(g) FROM t_wl6455 WHERE g = POINT(2,2);
 ST_AsText(g)
 POINT(2 2)
@@ -61,7 +61,7 @@ SELECT ST_AsText(g) FROM t_wl6455;
 ST_AsText(g)
 POINT(1 1)
 POINT(2 2)
-MULTIPOINT((0 0),(20 20),(60 60))
+MULTIPOINT(0 0,20 20,60 60)
 LINESTRING(1 1,4 4)
 LINESTRING(2 2,5 5)
 MULTILINESTRING((1 1,2 2,3 3),(4 4,5 5))

mysql-test/suite/innodb_gis/t/bug16236208.test

@@ -5,6 +5,7 @@
 
 --source include/have_geometry.inc
 --source include/not_embedded.inc
+--source include/have_innodb.inc
 
 --disable_warnings
 DROP TABLE IF EXISTS linestring;

mysql-test/suite/innodb_gis/t/bug17057168.test

@@ -5,6 +5,7 @@
 --source include/have_geometry.inc
 --source include/not_embedded.inc
 --source include/no_valgrind_without_big.inc
+--source include/have_innodb.inc
 
 CREATE DATABASE geotest;
 use geotest;

mysql-test/suite/innodb_gis/t/geometry.test

@@ -11,7 +11,7 @@
 --source include/have_geometry.inc
 --source include/not_embedded.inc
 --source include/have_debug.inc
---source include/have_innodb_zip.inc
+--source include/have_innodb.inc
 
 SET default_storage_engine=InnoDB;
 SET innodb_strict_mode=OFF;

mysql-test/suite/innodb_gis/t/gis_split_inf.test

@@ -4,20 +4,20 @@
 
 create table t1(a geometrycollection not null,spatial key(a))engine=innodb;
 
---error ER_GIS_INVALID_DATA
+--error ER_GIS_INVALID_DATA,ER_BAD_NULL_ERROR
 insert into  t1(a)  values( geometrycollection(multipolygon(polygon(linestring(point(-14,98), point(-14,98)), linestring(point(-97,64), point(-70,99), point(-97,64)), linestring(point(143851215403059150000000000000000000000.000000,13040009882500140000000000000000000000.000000), point(-73,85), point(-88,-29)))), multipolygon(polygon(linestring(point(41,95), point(4294967298,2050)), linestring(point(-61,85), point(-75,93), point(14,-2), point(1,84), point(-61,85)), linestring(point(-62,52), point(39,5), point(-18,12), point(-62,52))), polygon(linestring(point(-77,1), point(66,61), point(-77,1)), linestring(point(18446744073709551615,1125899906842622), point(-72,49), point(24,-66), point(82,73), point(68,22))), polygon(linestring(point(1048576,17179869181), point(-18,95), point(-90,-3), point(-33,82), point(20,-85)), linestring(point(-43,-97), point(-7,-3), point(39,-82), point(-65,-58), point(-43,-97)), linestring(point(44,-34), point(-69,58), point(44,-34)), linestring(point(57,-13), point(-17,74), point(57,-13)), linestring(point(3,71), point(-58,81), point(3,71)), linestring(point(9,25), point(77,-71), point(8388607,67108864), point(46,46), point(9,25)), linestring(point(98,-82), point(98,-82))))) )  ;
 
 insert into  t1(a)  values( geometrycollection(multilinestring(linestring(point(39,-60), point(-62,-11), point(-24,35), point(54,1)), linestring(point(-4,69), point(-22,-64), point(1.694824e+308,5.688896e+307), point(-33,-58), point(-64,-80), point(-15,-44), point(40,54)), linestring(point(-86,-54), point(11,41), point(-46,-38), point(-21,-8), point(10,70), point(-81,22), point(-46,-100)), linestring(point(-30,-48), point(50,58), point(-53,92), point(10,41), point(-46,-8)), linestring(point(-65,34), point(-92,93), point(-33,-74), point(75,-28)), linestring(point(25,-55), point(22,-10), point(-42,0), point(-86,-59), point(2,-37), point(63,-44), point(-55,-22)), linestring(point(28,0), point(-94,99), point(-32,-86)), linestring(point(9,-12), point(16,9), point(80,-73)), linestring(point(6,-55), point(83,-4)), linestring(point(-15,21), point(144115188075855876,16777212), point(-85,-31), point(-90,-50)), linestring(point(-33,33), point(21,90), point(-89,32)), linestring(point(16,24), point(73,-13), point(25,-48), point(71,52), point(-54,-78), point(-84,59), point(53,29)), linestring(point(-15,-81), point(83,43), point(-71,33), point(-8,0), point(84,-54), point(-35,38), point(-10,-50)), linestring(point(38,-50), point(20,-2), point(-57,-92)), linestring(point(5,-93), point(231601833467477080000000000000000000000.000000,51914987457169239000000000000000000000.000000), point(-94,62))), point(2,0)) )  ;
 insert  into  t1(a)  values( geometrycollection(multilinestring(linestring(point(80,-15), point(65,-57), point(-59,16), point(22,-67)), linestring(point(20,-55), point(-38,-64), point(19,-53), point(-63,-36), point(56,-37)), linestring(point(27,-8), point(-85,-75), point(4398046511106,2251799813685245)), linestring(point(45,32), point(-79,46))), multilinestring(linestring(point(8,-4), point(40,-38), point(100,95), point(5,-80), point(82,88)), linestring(point(-14,30), point(-94,51), point(-16,-29), point(37,-97), point(-26,92)), linestring(point(32,34), point(83,-23), point(-55,57), point(-15,90), point(32,-50), point(-20,-73), point(77,28)), linestring(point(4,88), point(87,74), point(-67,-58)), linestring(point(5.660747e+307,6.385657e+307), point(-58,-15), point(1.172095e+308,1.448533e+308)), linestring(point(-21,-37), point(-52,79), point(-16,-76), point(-65,-94), point(36,7), point(37,74), point(100,-57)), linestring(point(-23,-82), point(-73,23), point(18,-34)), linestring(point(20,-51), point(93,62), point(-65,84)), linestring(point(-48,31), point(-69,-96)), linestring(point(-5,78), point(10,-99), point(36,-33)), linestring(point(-84,55), point(96,1), point(-98,-29), point(-15,81), point(-27,-6), point(58,-32), point(54,-16)), linestring(point(2,5), point(2199023255553,8192)), linestring(point(12,-78), point(-97,-83)), linestring(point(-74,79), point(35,-56), point(50,95)), linestring(point(28,16), point(-39,-40), point(48,-3)), linestring(point(2199023255550,-65539), point(62,-25), point(94,-62)), linestring(point(-74,83), point(-18,75), point(91,17), point(-11,-48), point(30,100)), linestring(point(57,-13), point(88,-45)), linestring(point(20,-64), point(-37,13), point(20,35))), point(-3,-4)) )  ;
---error ER_GIS_INVALID_DATA
+--error ER_GIS_INVALID_DATA,ER_BAD_NULL_ERROR
 insert  into  t1(a)  values( geometrycollection(multipolygon(polygon(linestring(point(-34,19), point(-25,92), point(61921390294166805000000000000000000000.000000,319674749161701840000000000000000000000.000000), point(56,50), point(-34,19)), linestring(point(-26,-58), point(99,-50), point(34,-20), point(-26,-58)), linestring(point(-42,45), point(-63,-7), point(5,-89), point(-97,36), point(-42,45)), linestring(point(94,11), point(-71,4), point(94,11)), linestring(point(16,25), point(4,-33), point(-45,-33), point(-64,-77), point(16,25)), linestring(point(19,45), point(36,45), point(-83,-96), point(19,45)), linestring(point(85,-31), point(-87,52), point(85,-31))), polygon(linestring(point(55,-88), point(63,-12), point(55,-88)), linestring(point(-49,10), point(-49,10)), linestring(point(-51,-32), point(-51,-32)))), multipolygon(polygon(linestring(point(-21,-8), point(66,-58), point(100,-27), point(-21,-8)), linestring(point(-29,-13), point(-29,-13))), polygon(linestring(point(91307574660224730000000000000000000000.000000,101214152547755520000000000000000000000.000000), point(89,64), point(77,87), point(66,29), point(-71,-53)), linestring(point(38,-78), point(-43,-90), point(37,20), point(81,65), point(38,-78))), polygon(linestring(point(51,0), point(-62,8), point(-11,22), point(51,0)), linestring(point(-4,-44), point(6,82), point(-19,-90), point(131,32)))), point(-4,-7)) )  ;
 insert  into  t1(a)  values( geometrycollection(point(10,9), linestring(point(2305843009213693955,-1125899906842621), point(78,15)), multipoint(point(-1,3), point(4,-6))) )  ;
---error ER_GIS_INVALID_DATA
+--error ER_GIS_INVALID_DATA,ER_BAD_NULL_ERROR
 insert  into  t1(a)  values( geometrycollection(polygon(linestring(point(0,13), point(-12,5), point(0,13)), linestring(point(11,-2), point(6,6), point(20,-14), point(-3,-10), point(1.330588e+308,2.666476e+307)), linestring(point(16382,67), point(7,4)), linestring(point(2,7), point(-14,15), point(2,7)), linestring(point(-14,12), point(-8,-8), point(-17,-2), point(-14,12)), linestring(point(-20,-10), point(-8,-13), point(-19,-17), point(13,-3), point(-20,-10)), linestring(point(-5,13), point(7,-9), point(6,8), point(-5,13))), linestring(point(-87,19), point(-64,51), point(-16,12)), multipoint(point(-1,-10), point(2,-10), point(3.670354e+307,2.501459e+307))) )  ;
---error ER_GIS_INVALID_DATA
+--error ER_GIS_INVALID_DATA,ER_BAD_NULL_ERROR
 insert  into  t1(a)  values( geometrycollection(multipoint(point(-3,7), point(4,-3), point(-6,-2), point(-9,1)), polygon(linestring(point(-17,-5), point(2,-8), point(-6,9), point(-9,19), point(-17,-5)), linestring(point(10,-1), point(15,-7), point(-13,6), point(10,-1))), multipolygon(polygon(linestring(point(69,-69), point(-90,-64), point(-17,4), point(47,-73), point(69,-69)), linestring(point(-35,-77), point(-35,-77)), linestring(point(95,-76), point(1.636688e+308,1.828723e+307), point(68719476740,536870916), point(95,-76)), linestring(point(-26,-85), point(-26,-85)), linestring(point(-53,57), point(-53,57)), linestring(point(-98,-64), point(79,-57), point(-98,-64)), linestring(point(-91,59), point(16,0), point(73,97), point(-35,-70), point(-91,59))))) )  ;
 insert  into  t1(a)  values( geometrycollection(linestring(point(85,-29), point(15,84), point(39,-92), point(-99,19)), multilinestring(linestring(point(63,10), point(-47,95), point(10,-49), point(16,-65), point(-98,40), point(25,44), point(-55,-92)), linestring(point(5.266810e+307,6.648813e+307), point(47,33), point(-15,-13), point(-92,-58), point(36,73)), linestring(point(77,-56), point(-53,-10), point(-28,76), point(-51,6), point(51,-31), point(-95,81), point(92,26)), linestring(point(-91,7), point(58,53)), linestring(point(18,5), point(18,40), point(71,89), point(7.898707e+307,1.202585e+308), point(53,100)), linestring(point(-60,-18), point(-10,-31), point(-6,-25), point(-57,-95), point(16,77)))) )  ;
---error ER_GIS_INVALID_DATA
+--error ER_GIS_INVALID_DATA,ER_BAD_NULL_ERROR
 insert  into  t1(a)  values( geometrycollection(polygon(linestring(point(-9,0), point(-17,-15), point(-9,0)), linestring(point(-11,1), point(18,12), point(15,3), point(7,0), point(-11,1)), linestring(point(19,5), point(19,5)), linestring(point(17,-11), point(8,4), point(17,-11)), linestring(point(14914539334033432000000000000000000000.000000,127247994336690690000000000000000000000.000000), point(-14,-7), point(13,-2))), point(-4,-7), polygon(linestring(point(-18,9), point(11,-1), point(-18,9)), linestring(point(9,-3), point(9,-3)), linestring(point(-7,-9), point(9,-11), point(11,14), point(1.663324e+308,1.572127e+308)), linestring(point(-15,4), point(18,12), point(7,2), point(-15,4)), linestring(point(-15,-18), point(-20,-15), point(1152921504606846972,34359738370))), polygon(linestring(point(-5,-19), point(-11,11), point(10,5), point(-7,13), point(-5,-19)), linestring(point(-8,-6), point(-4,16), point(-8,-6)), linestring(point(-6,-10), point(3,-12), point(-6,-10)), linestring(point(-16,1), point(20,-12), point(-16,1)), linestring(point(-8,5), point(-20,-4), point(4,1), point(-6,-6), point(-8,5)), linestring(point(-8,-11), point(-5,-14), point(-8,-11)), linestring(point(3,-16), point(-15,-13), point(1.166708e+308,1.901147e+307), point(-8,6), point(3,-16))), point(0,-5)) )  ;
 insert  into  t1(a)  values( geometrycollection(linestring(point(-33,99), point(99,-87), point(38,-79), point(33,-39), point(-91,-8), point(46,-87))) )  ;
 

mysql-test/suite/innodb_gis/t/kill_server.test

@@ -49,7 +49,8 @@ truncate table t1;
 # Test crash recovery.
 #
 #
-call mtr.add_suppression("InnoDB: page [0-9]+ in the doublewrite buffer is not within space bounds.*");
+
+call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page number=[0-9]+\] in the doublewrite buffer slot [0-9]+ is not within space bounds");
 
 # Test rtree enlarge recovery.
 START TRANSACTION;

mysql-test/suite/innodb_gis/t/point_basic.test

@@ -772,16 +772,25 @@ ALTER TABLE child ADD SPATIAL INDEX idx2(p ASC);
 SHOW CREATE TABLE parent;
 SHOW CREATE TABLE child;
 
---error ER_CANNOT_ADD_FOREIGN
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+--error ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+show warnings;
 
 ALTER TABLE parent DROP INDEX idx1;
---error ER_CANNOT_ADD_FOREIGN
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+--error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+show warnings;
 
 ALTER TABLE child DROP INDEX idx2;
---error ER_CANNOT_ADD_FOREIGN
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+--error ER_CANNOT_ADD_FOREIGN,ER_CANT_CREATE_TABLE
 ALTER TABLE child ADD FOREIGN KEY(p) REFERENCES parent(p);
+--replace_regex /#sql-[0-9a-f_]*`/#sql-temporary`/
+show warnings;
 
 DROP TABLE child, parent;
 

mysql-test/suite/innodb_gis/t/row_format.test

 --source include/not_embedded.inc
 --source include/have_innodb.inc
---source include/have_innodb_zip.inc
+--source include/innodb_page_size_small.inc
 
 # Test the redundant format
 LET $file_per_table='off';

mysql-test/suite/innodb_gis/t/rtree_compress2.test

@@ -39,7 +39,7 @@ truncate table t1;
 # Test crash recovery.
 #
 #
-call mtr.add_suppression("InnoDB: page [0-9]+ in the doublewrite buffer is not within space bounds.*");
+call mtr.add_suppression("InnoDB: A copy of page \[page id: space=[0-9]+, page number=[0-9]+\] in the doublewrite buffer slot [0-9]+ is not within space bounds");
 
 # Test rtree enlarge recovery.
 START TRANSACTION;

mysql-test/suite/innodb_gis/t/rtree_drop_index.test

@@ -6,7 +6,10 @@
 --echo # Bug #21899444	INNODB: ASSERT FAILURE (COL->ORD_PART)
 --echo #	IN DICT_COL_GET_SPATIAL_STATUS()
 
-set global innodb_purge_stop_now = on;
+connect  purge_control,localhost,root;
+START TRANSACTION WITH CONSISTENT SNAPSHOT;
+connection default;
+
 CREATE TABLE t1 (
   p     INT NOT NULL AUTO_INCREMENT,
   g     LINESTRING NOT NULL,
@@ -19,7 +22,12 @@ INSERT INTO t1(g) VALUES (ST_linefromtext(concat('linestring','(20 110, 21 110,
 UPDATE t1 SET g = ST_linefromtext('linestring(-5 -576,0 -576,0 -571,0 -571,5 -568,6 -564,6 -565,6 -563)') WHERE p = 2;
 
 alter table t1 drop index `si`;
-set global innodb_purge_run_now=on;
+
+connection purge_control;
+COMMIT;
+disconnect purge_control;
+connection default;
+
 set global innodb_fast_shutdown = 0;
 --source include/restart_mysqld.inc
 drop table t1;

mysql-test/suite/innodb_gis/t/rtree_old.test

 # This is a testcase ported from mysql-test/t/gis-rtree.test
 
 -- source include/have_geometry.inc
+-- source include/have_innodb.inc
 
 #
 # test of rtree (using with spatial data)

mysql-test/suite/innodb_gis/t/rtree_purge.test

@@ -45,7 +45,7 @@ delimiter ;|
 
 call p(200);
 
---source include/wait_innodb_all_purged.inc
+--source include/wait_all_purged.inc
 
 # Clean up.
 drop procedure p;