database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 11.4 into 11.8

Browse Source
This commit is contained in:
Marko Mäkelä
2025-04-02 14:07:01 +03:00
parent 6e4fa7e5a1 3ae8f114e2
commit bb1d88b6dc
786 changed files with 10229 additions and 5958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mysql-test/suite/innodb/r/innodb-index-online.result
View File

@@ -532,7 +532,6 @@ INSERT INTO t1 VALUES(1,1);
ROLLBACK;
SET DEBUG_SYNC = 'now SIGNAL inserted';
connection con1;
disconnect con1;
connection default;
SELECT * FROM t1;
a b
@@ -541,6 +540,31 @@ CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE t1;
#
# MDEV-36281 DML aborts during online virtual index
#
CREATE TABLE t1(f1 INT NOT NULL PRIMARY KEY, f2 INT NOT NULL,
f3 INT NOT NULL, f4 INT AS (f3) VIRTUAL,
f5 INT AS (f1) VIRTUAL, INDEX(f4))ENGINE=InnoDB;
INSERT INTO t1(f1, f2, f3) VALUES(1, 2, 3);
SET DEBUG_SYNC = 'innodb_inplace_alter_table_enter SIGNAL dml_start WAIT_FOR dml_finish';
ALTER TABLE t1 ADD INDEX v1(f5, f2, f4), ADD INDEX v2(f3, f5);
connection con1;
set DEBUG_SYNC="now WAIT_FOR dml_start";
UPDATE t1 SET f3= f3 + 1;
set DEBUG_SYNC="now SIGNAL dml_finish";
disconnect con1;
connection default;
CHECK TABLE t1 EXTENDED;
Table Op Msg_type Msg_text
test.t1 check status OK
SELECT f5, f2, f4 FROM t1 USE INDEX(v1);
f5 f2 f4
1 2 4
SELECT f3, f5 FROM t1 USE INDEX(v2);
f3 f5
4 1
DROP TABLE t1;
SET DEBUG_SYNC = 'RESET';
SET GLOBAL innodb_monitor_enable = default;
SET GLOBAL innodb_monitor_disable = default;