database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.3 into 10.4

Browse Source 
The MDEV-17062 fix in commit c4195305b2
was omitted.
This commit is contained in:
Marko Mäkelä
2020-01-20 15:49:48 +02:00
parent 7ea413ac2d bc43bf3e43
commit 87a61355e8
261 changed files with 3749 additions and 963 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb_gis/t/rtree_debug.test
View File

@ -53,7 +53,7 @@ SET @save_dbug = @@SESSION.debug_dbug;
SET debug_dbug='+d,row_merge_ins_spatial_fail';
--error ER_GET_ERRNO
create spatial index idx2 on t1(c2);
SET debug_dbug = @save_dbug;
SET @@SESSION.debug_dbug = @save_dbug;
show create table t1;
# Check table.

3
mysql-test/suite/innodb_gis/t/rtree_rollback1.test
View File

@ -1,9 +1,6 @@
# WL#6745 InnoDB R-tree support
# This test case will test R-tree split.
# Not supported in embedded
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/big_test.inc
--source include/not_valgrind.inc

3
mysql-test/suite/innodb_gis/t/rtree_rollback2.test
View File

@ -1,9 +1,6 @@
# WL#6745 InnoDB R-tree support
# This test case will test R-tree split.
# Not supported in embedded
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/big_test.inc
--source include/not_valgrind.inc