Merge branch '10.3' into 10.4

3 files changed, 6 insertions, 0 deletions

diff --git a/mysql-test/suite/innodb_gis/r/rtree_compress2.result b/mysql-test/suite/innodb_gis/r/rtree_compress2.result
index 3fa6b5e8c01..503be08c66f 100644
--- a/mysql-test/suite/innodb_gis/r/rtree_compress2.result
+++ b/mysql-test/suite/innodb_gis/r/rtree_compress2.result
@@ -8,7 +8,9 @@ insert into t1 values (i, Point(i, i));
 set i = i + 1;
 end while;
 end|
+begin;
 CALL insert_t1(70000);
+commit;
 check table t1;
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
diff --git a/mysql-test/suite/innodb_gis/t/rtree_compress2.test b/mysql-test/suite/innodb_gis/t/rtree_compress2.test
index 95be8b8f357..051fcfcac46 100644
--- a/mysql-test/suite/innodb_gis/t/rtree_compress2.test
+++ b/mysql-test/suite/innodb_gis/t/rtree_compress2.test
@@ -28,7 +28,9 @@ end|
 delimiter ;|
 
 # Test level 3 rtree.
+begin;
 CALL insert_t1(70000);
+commit;
 
 --let $shutdown_timeout=0
 --source include/restart_mysqld.inc
diff --git a/mysql-test/suite/innodb_gis/t/update_root.test b/mysql-test/suite/innodb_gis/t/update_root.test
index 395fc715f31..c6d3ba60650 100644
--- a/mysql-test/suite/innodb_gis/t/update_root.test
+++ b/mysql-test/suite/innodb_gis/t/update_root.test
@@ -8,6 +8,8 @@
 --source include/have_debug.inc
 --source include/big_test.inc
 --source include/not_valgrind.inc
+--source include/have_64bit.inc
+
 # Create table with R-tree index.
 create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;