mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-12-19 15:38:53 +02:00
commit a54d151fc1
129 changed files with 1403 additions and 1731 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mysql-test/suite/innodb_fts/r/savepoint.result
View file

@ -249,9 +249,33 @@ id title
7 mysql
TRUNCATE TABLE articles;
INSERT INTO articles(id, title) VALUES(1, 'mysql');
CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
BEGIN;
INSERT INTO t SET a=1;
SAVEPOINT t;
INSERT INTO articles(id, title) VALUES(2, 'mysql');
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
id title
1 mysql
ROLLBACK TO SAVEPOINT t;
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
id title
1 mysql
SELECT * FROM t;
a
1
COMMIT;
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
id title
1 mysql
BEGIN;
INSERT INTO t SET a=2;
INSERT INTO articles(id, title) VALUES(2, 'mysql');
ROLLBACK;
SELECT * FROM t;
a
1
DROP TABLE t;
INSERT INTO articles(id, title) VALUES(3, 'mysql');
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
id title

16
mysql-test/suite/innodb_fts/t/savepoint.test
View file

@ -366,12 +366,28 @@ TRUNCATE TABLE articles;
INSERT INTO articles(id, title) VALUES(1, 'mysql');
CREATE TABLE t(a INT PRIMARY KEY) ENGINE=InnoDB;
BEGIN;
INSERT INTO t SET a=1;
SAVEPOINT t;
INSERT INTO articles(id, title) VALUES(2, 'mysql');
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
ROLLBACK TO SAVEPOINT t;
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
SELECT * FROM t;
COMMIT;
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');
BEGIN;
INSERT INTO t SET a=2;
INSERT INTO articles(id, title) VALUES(2, 'mysql');
ROLLBACK;
SELECT * FROM t;
DROP TABLE t;
INSERT INTO articles(id, title) VALUES(3, 'mysql');
SELECT * FROM articles WHERE MATCH(title) AGAINST('mysql');