database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '11.2' into 11.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-10-30 09:24:04 +01:00
parent 973e641c32 67c0fd2a41
commit c770bce898
734 changed files with 10187 additions and 4442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/innodb_gis/r/rtree.result
View File

@ -866,3 +866,17 @@ INSERT INTO `address` VALUES (1,'47 MySakila Drive',NULL,'Alberta',300,'','',0x0
(605,'1325 Fukuyama Street','','Heilongjiang',537,'27107','288241215394',0x00000000010100000017540A70700160401E1C47077F7D4740,'2014-09-25 22:30:44');
COMMIT;
DROP TABLE address;
#
# MDEV-35116 InnoDB fails to set error index
# for HA_ERR_NULL_IN_SPATIAL
#
BINLOG ' SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
CREATE TABLE t1 (i INT, g GEOMETRY NOT NULL,
SPATIAL INDEX (g)) ENGINE=InnoDB;
CREATE TEMPORARY TABLE t2 (PRIMARY KEY(a)) ENGINE=InnoDB
WITH RECURSIVE t(a) AS (VALUES(1),(1)) SELECT * FROM t;
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table .*");
BINLOG ' SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf /+ AgAAAA==';
ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
DROP TABLE t1;

16
mysql-test/suite/innodb_gis/t/rtree.test
View File

@ -851,3 +851,19 @@ INSERT INTO `address` VALUES (1,'47 MySakila Drive',NULL,'Alberta',300,'','',0x0
COMMIT;
DROP TABLE address;
--echo #
--echo # MDEV-35116 InnoDB fails to set error index
--echo # for HA_ERR_NULL_IN_SPATIAL
--echo #
BINLOG ' SOgWTg8BAAAAbgAAAHIAAAAAAAQANS42LjMtbTUtZGVidWctbG9nAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAABI6BZOEzgNAAgAEgAEBAQEEgAAVgAEGggAAAAICAgCAAAAAAVAYI8=';
CREATE TABLE t1 (i INT, g GEOMETRY NOT NULL,
SPATIAL INDEX (g)) ENGINE=InnoDB;
--error ER_DUP_ENTRY
CREATE TEMPORARY TABLE t2 (PRIMARY KEY(a)) ENGINE=InnoDB
WITH RECURSIVE t(a) AS (VALUES(1),(1)) SELECT * FROM t;
call mtr.add_suppression("BINLOG_BASE64_EVENT: Could not execute Write_rows_v1 event on table .*");
--error ER_CANT_CREATE_GEOMETRY_OBJECT
BINLOG ' SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf /+ AgAAAA==';
DROP TABLE t1;