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

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2023-11-21 12:47:51 +02:00
parent 804b5974f5 4c16ec3e77
commit f87c7d1772
76 changed files with 207 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/gcol/r/gcol_partition_innodb.result
View File

@ -1,4 +1,6 @@
SET @@session.default_storage_engine = 'InnoDB';
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET default_storage_engine = 'InnoDB';
drop table if exists t1;
# Case 1. Partitioning by RANGE based on a non-stored generated column.
CREATE TABLE t1 (
@ -126,6 +128,7 @@ Warnings:
Warning 1906 The value specified for generated column 'vd' in table 't1' has been ignored
DROP TABLE t1;
InnoDB 0 transactions not purged
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
DROP VIEW IF EXISTS v1,v2;
DROP TABLE IF EXISTS t1,t2,t3;
DROP PROCEDURE IF EXISTS p1;

2
mysql-test/suite/gcol/r/gcol_purge.result
View File

@ -1,7 +1,7 @@
SET @save_dbug=@@GLOBAL.debug_dbug;
CREATE TABLE t1(f1 INT NOT NULL, f2 int not null,
f3 int generated always as (f2 * 2) VIRTUAL,
primary key(f1), INDEX (f3))ENGINE=InnoDB;
primary key(f1), INDEX (f3))ENGINE=InnoDB STATS_PERSISTENT=0;
connect con1,localhost,root,,,;
InnoDB 0 transactions not purged
START TRANSACTION WITH CONSISTENT SNAPSHOT;

3
mysql-test/suite/gcol/r/gcol_update.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
connect purge_control,localhost,root;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
@ -37,3 +39,4 @@ InnoDB 0 transactions not purged
disconnect purge_control;
connection default;
drop table t1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

3
mysql-test/suite/gcol/r/innodb_virtual_debug.result
View File

@ -1,4 +1,6 @@
set default_storage_engine=innodb;
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
CREATE TABLE `t` (
`a` VARCHAR(100),
`b` VARCHAR(100),
@ -145,3 +147,4 @@ DROP TABLE t1;
disconnect con1;
connection default;
SET DEBUG_SYNC=RESET;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

3
mysql-test/suite/gcol/r/innodb_virtual_purge.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
#
# Bug#21869656 UNDO LOG DOES NOT CONTAIN ENOUGH INFORMATION
# ON INDEXED VIRTUAL COLUMNS
@ -171,3 +173,4 @@ CHECK TABLE t EXTENDED;
Table Op Msg_type Msg_text
test.t check status OK
DROP TABLE t;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

7
mysql-test/suite/gcol/t/gcol_partition_innodb.test
View File

@ -29,7 +29,9 @@
##### Storage engine to be tested
# Set the session storage engine
--source include/have_innodb.inc
eval SET @@session.default_storage_engine = 'InnoDB';
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET default_storage_engine = 'InnoDB';
##### Workarounds for known open engine specific bugs
# none
@ -58,6 +60,9 @@ REPLACE INTO t1 SELECT * FROM t1;
DROP TABLE t1;
--source suite/innodb/include/wait_all_purged.inc
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
#------------------------------------------------------------------------------#
# Cleanup
--source suite/gcol/inc/gcol_cleanup.inc

2
mysql-test/suite/gcol/t/gcol_purge.test
View File

@ -4,7 +4,7 @@
SET @save_dbug=@@GLOBAL.debug_dbug;
CREATE TABLE t1(f1 INT NOT NULL, f2 int not null,
f3 int generated always as (f2 * 2) VIRTUAL,
primary key(f1), INDEX (f3))ENGINE=InnoDB;
primary key(f1), INDEX (f3))ENGINE=InnoDB STATS_PERSISTENT=0;
connect(con1,localhost,root,,,);
--source ../innodb/include/wait_all_purged.inc
START TRANSACTION WITH CONSISTENT SNAPSHOT;

5
mysql-test/suite/gcol/t/gcol_update.test
View File

@ -1,5 +1,8 @@
--source include/have_innodb.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
connect (purge_control,localhost,root);
START TRANSACTION WITH CONSISTENT SNAPSHOT;
@ -60,3 +63,5 @@ disconnect purge_control;
connection default;
drop table t1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

6
mysql-test/suite/gcol/t/innodb_virtual_debug.test
View File

@ -4,6 +4,10 @@
--source include/count_sessions.inc
set default_storage_engine=innodb;
# Ensure that the history list length will actually be decremented by purge.
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
CREATE TABLE `t` (
`a` VARCHAR(100),
`b` VARCHAR(100),
@ -338,4 +342,6 @@ DROP TABLE t1;
connection default;
SET DEBUG_SYNC=RESET;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--source include/wait_until_count_sessions.inc

5
mysql-test/suite/gcol/t/innodb_virtual_purge.test
View File

@ -1,6 +1,9 @@
--source include/have_innodb.inc
--source include/count_sessions.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
--echo #
--echo # Bug#21869656 UNDO LOG DOES NOT CONTAIN ENOUGH INFORMATION
--echo # ON INDEXED VIRTUAL COLUMNS
@ -182,4 +185,6 @@ SET GLOBAL innodb_max_purge_lag_wait=0;
CHECK TABLE t EXTENDED;
DROP TABLE t;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--source include/wait_until_count_sessions.inc

1
mysql-test/suite/innodb/r/alter_kill.result
View File

@ -2,6 +2,7 @@
# Bug#16720368 INNODB CRASHES ON BROKEN #SQL*.IBD FILE AT STARTUP
#
SET GLOBAL innodb_file_per_table=1;
SET GLOBAL innodb_stats_persistent=0;
CREATE TABLE bug16720368_1 (a INT PRIMARY KEY) ENGINE=InnoDB;
connect con1,localhost,root;
CREATE TABLE bug16720368 (a INT PRIMARY KEY, b INT) ENGINE=InnoDB;

3
mysql-test/suite/innodb/r/dml_purge.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
#
# MDEV-12288 Reset DB_TRX_ID when the history is removed,
# to speed up MVCC
@ -46,3 +48,4 @@ a b c
1 2 NULL
3 -3 NULL
DROP TABLE t1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

4
mysql-test/suite/innodb/r/foreign_key.result
View File

@ -1,3 +1,4 @@
SET GLOBAL innodb_stats_persistent = 0;
#
# Bug #19027905 ASSERT RET.SECOND DICT_CREATE_FOREIGN_CONSTRAINTS_LOW
# DICT_CREATE_FOREIGN_CONSTR
@ -154,6 +155,8 @@ INSERT INTO parent SET a=0;
FLUSH TABLES;
# restart
disconnect incomplete;
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
INSERT INTO child SET a=0;
INSERT INTO child SET a=1;
ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`child`, CONSTRAINT `child_ibfk_1` FOREIGN KEY (`a`) REFERENCES `parent` (`a`) ON DELETE CASCADE)
@ -1074,3 +1077,4 @@ test.collections check status OK
disconnect con1;
DROP TABLE binaries, collections;
# End of 10.6 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

3
mysql-test/suite/innodb/r/full_crc32_import.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
FLUSH TABLES;
# Treating compact format as dynamic format after import stmt
CREATE TABLE t1
@ -200,3 +202,4 @@ a
3
DROP TABLE t1;
SET GLOBAL innodb_compression_algorithm=@save_algo;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

3
mysql-test/suite/innodb/r/index_merge_threshold.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
CREATE TABLE tab(a BIGINT PRIMARY KEY,c1 TINYTEXT,c2 TEXT,c3 MEDIUMTEXT,
c4 TINYBLOB,c5 BLOB,c6 MEDIUMBLOB,c7 LONGBLOB) ENGINE=InnoDB;
CREATE INDEX index1 ON tab(c1(255)) COMMENT 'Check index level merge MERGE_THRESHOLD=51';
@ -1307,3 +1309,4 @@ name count_reset
index_page_merge_attempts 2
index_page_merge_successful 2
DROP TABLE tab1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

3
mysql-test/suite/innodb/r/innodb-16k.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
call mtr.add_suppression("InnoDB: Cannot add field .* in table");
# Test 1) Show the page size from Information Schema
SELECT variable_value FROM information_schema.global_status
@ -505,6 +507,7 @@ INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
DROP TABLE t1;
InnoDB 0 transactions not purged
SET GLOBAL innodb_compression_level=@save_level;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge;
DROP TABLE tlong;
DROP TABLE tlong2;

1
mysql-test/suite/innodb/r/innodb-32k.result
View File

@ -1,3 +1,4 @@
SET GLOBAL innodb_stats_persistent = 0;
call mtr.add_suppression("Innodb: Cannot add field.*row size is");
# Test 1) Show the page size from Information Schema
SELECT variable_value FROM information_schema.global_status

3
mysql-test/suite/innodb/r/innodb-system-table-view.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SELECT table_id INTO @table_stats_id FROM information_schema.innodb_sys_tables
WHERE name = 'mysql/innodb_table_stats';
SELECT table_id INTO @index_stats_id FROM information_schema.innodb_sys_tables
@ -173,3 +175,4 @@ DROP TABLE parent;
SELECT SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE name like 'innodb_temporary';
SPACE
4294967294
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

2
mysql-test/suite/innodb/r/innodb_scrub.result
View File

@ -1,6 +1,6 @@
CREATE TABLE t1(f1 int auto_increment primary key,
f2 varchar(256),
f3 text) engine = innodb;
f3 text) engine = innodb stats_persistent=0;
FLUSH TABLE t1 FOR EXPORT;
UNLOCK TABLES;
FOUND 500500 /unicycle|repairman/ in t1.ibd

2
mysql-test/suite/innodb/r/innodb_stats_persistent.result
View File

@ -57,7 +57,7 @@ connection con1;
EXPLAIN SELECT * FROM t2 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 ref val val 4 const 1 Using index
InnoDB 0 transactions not purged
SET GLOBAL innodb_max_purge_lag_wait=0;
# After COMMIT and purge, the DELETE must show up.
EXPLAIN SELECT * FROM t1 WHERE val=4;
id select_type table type possible_keys key key_len ref rows Extra

3
mysql-test/suite/innodb/r/instant_alter.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
#
# MDEV-11369: Instant ADD COLUMN for InnoDB
#
@ -2937,3 +2939,4 @@ index(id, msg)
FLUSH TABLES;
ALTER TABLE mdev28822_100427_innodb ADD i1 INTEGER, ALGORITHM=INSTANT;
DROP TABLE mdev28822_100427_innodb;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

4
mysql-test/suite/innodb/r/instant_alter_bugs.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
#
# MDEV-17821 Assertion `!page_rec_is_supremum(rec)' failed
# in btr_pcur_store_position
@ -492,3 +494,5 @@ CREATE TABLE t1 (i int AS (0) STORED, j INT) ENGINE=InnoDB;
ALTER TABLE t1 ADD COLUMN i INT GENERATED ALWAYS AS (1), DROP COLUMN i;
DROP TABLE t1;
# End of 10.4 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
# End of 10.6 tests

4
mysql-test/suite/innodb/r/instant_alter_debug,redundant.rdiff
View File

@ -1,6 +1,8 @@
@@ -527,4 +527,4 @@
@@ -527,6 +527,6 @@
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
instants
-35
+36
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
# End of 10.6 tests

4
mysql-test/suite/innodb/r/instant_alter_debug.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET @old_instant=
(SELECT variable_value FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column');
@ -524,3 +526,5 @@ FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
instants
35
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
# End of 10.6 tests

2
mysql-test/suite/innodb/r/instant_alter_purge.result
View File

@ -5,7 +5,7 @@ InnoDB 0 transactions not purged
connect prevent_purge,localhost,root;
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB;
CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 () VALUES ();
ALTER TABLE t1 DROP f2, ADD COLUMN f2 INT;
ALTER TABLE t1 DROP f1;

1
mysql-test/suite/innodb/r/instant_alter_rollback.result
View File

@ -1,3 +1,4 @@
SET GLOBAL innodb_stats_persistent = 0;
FLUSH TABLES;
#
# MDEV-11369: Instant ADD COLUMN for InnoDB

2
mysql-test/suite/innodb/r/page_id_innochecksum.result
View File

@ -1,5 +1,5 @@
# Set the environmental variables
create table t1(f1 int not null)engine=innodb;
create table t1(f1 int not null)engine=innodb stats_persistent=0;
insert into t1 values(1), (2), (3);
# Change the page offset
FOUND 1 /page id mismatch/ in result.log

3
mysql-test/suite/innodb/r/purge.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
# Bug #12429576 - Test an assertion failure on purge.
CREATE TABLE t1_purge (
A int,
@ -115,4 +117,5 @@ t12963823 CREATE TABLE `t12963823` (
KEY `ndx_p` (`p`(500))
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci ROW_FORMAT=DYNAMIC
InnoDB 0 transactions not purged
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge, t12637786, t12963823;

4
mysql-test/suite/innodb/r/purge_secondary.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
CREATE TABLE t1 (
a SERIAL, b CHAR(255) NOT NULL DEFAULT '', c BOOLEAN DEFAULT false,
l LINESTRING NOT NULL DEFAULT ST_linefromtext('linestring(448 -689,
@ -167,3 +169,5 @@ page 5: N_RECS=0x0001
UNLOCK TABLES;
DROP TABLE t1;
# End of 10.3 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
# End of 10.6 tests

2
mysql-test/suite/innodb/r/scrub_debug.result
View File

@ -4,7 +4,7 @@ SET GLOBAL INNODB_IMMEDIATE_SCRUB_DATA_UNCOMPRESSED=1;
SET GLOBAL INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=2;
CREATE TABLE t1(f1 INT AUTO_INCREMENT PRIMARY KEY,
f2 VARCHAR(256) GENERATED ALWAYS as('repairman'),
INDEX idx(f2))ENGINE= InnoDB;
INDEX idx(f2))ENGINE= InnoDB STATS_PERSISTENT=0;
INSERT INTO t1(f1) SELECT seq FROM seq_1_to_50;
FLUSH TABLE t1 FOR EXPORT;
FOUND 108 /repairman/ in t1.ibd

2
mysql-test/suite/innodb/r/truncate_crash.result
View File

@ -1,5 +1,5 @@
FLUSH TABLES;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 VALUES (1),(2);
connect wait,localhost,root,,test;
SET DEBUG_SYNC='before_trx_state_committed_in_memory SIGNAL c WAIT_FOR ever';

2
mysql-test/suite/innodb/r/trx_id_future.result
View File

@ -2,7 +2,7 @@
# Bug #20445525 ADD A CONSISTENCY CHECK AGAINST DB_TRX_ID BEING
# IN THE FUTURE
#
CREATE TABLE t1(a INT) row_format=redundant engine=innoDB;
CREATE TABLE t1(a INT) row_format=redundant engine=innoDB stats_persistent=0;
INSERT INTO t1 VALUES(1);
InnoDB 0 transactions not purged
call mtr.add_suppression("\\[Warning\\] InnoDB: A transaction id in a record of table `test`\\.`t1` is newer than the system-wide maximum");

3
mysql-test/suite/innodb/r/undo_log.result
View File

@ -1,3 +1,5 @@
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET innodb_strict_mode=OFF;
CREATE TABLE test_tab (
a_str_18 mediumtext,
@ -154,3 +156,4 @@ ROLLBACK;
InnoDB 0 transactions not purged
DROP TABLE t1;
DROP TABLE t2;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

1
mysql-test/suite/innodb/t/alter_kill.test
View File

@ -26,6 +26,7 @@ call mtr.add_suppression("Table .*bug16720368.* is corrupted");
-- echo #
SET GLOBAL innodb_file_per_table=1;
SET GLOBAL innodb_stats_persistent=0;
CREATE TABLE bug16720368_1 (a INT PRIMARY KEY) ENGINE=InnoDB;

5
mysql-test/suite/innodb/t/dml_purge.test
View File

@ -1,5 +1,8 @@
--source include/innodb_page_size.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
let MYSQLD_DATADIR=`select @@datadir`;
@ -76,3 +79,5 @@ EOF
UNLOCK TABLES;
SELECT * FROM t1;
DROP TABLE t1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

7
mysql-test/suite/innodb/t/foreign_key.test
View File

@ -2,6 +2,8 @@
--source include/count_sessions.inc
--source include/default_charset.inc
SET GLOBAL innodb_stats_persistent = 0;
--echo #
--echo # Bug #19027905 ASSERT RET.SECOND DICT_CREATE_FOREIGN_CONSTRAINTS_LOW
--echo # DICT_CREATE_FOREIGN_CONSTR
@ -126,6 +128,9 @@ FLUSH TABLES;
--let $shutdown_timeout=
disconnect incomplete;
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
INSERT INTO child SET a=0;
--error ER_NO_REFERENCED_ROW_2
INSERT INTO child SET a=1;
@ -1132,4 +1137,6 @@ DROP TABLE binaries, collections;
--echo # End of 10.6 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--source include/wait_until_count_sessions.inc

4
mysql-test/suite/innodb/t/full_crc32_import.test
View File

@ -2,6 +2,9 @@
# This test is slow on buildbot.
--source include/big_test.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
FLUSH TABLES;
let $MYSQLD_TMPDIR = `SELECT @@tmpdir`;
@ -222,3 +225,4 @@ SELECT * FROM t1;
DROP TABLE t1;
SET GLOBAL innodb_compression_algorithm=@save_algo;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

5
mysql-test/suite/innodb/t/index_merge_threshold.test
View File

@ -13,6 +13,9 @@
--source include/have_innodb_16k.inc
--source include/have_partition.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
# Check index merge threshold by create index on all datatypes
CREATE TABLE tab(a BIGINT PRIMARY KEY,c1 TINYTEXT,c2 TEXT,c3 MEDIUMTEXT,
@ -186,3 +189,5 @@ CREATE INDEX index1 ON tab1(b(750)) COMMENT 'MERGE_THRESHOLD=45';
--source suite/innodb/include/innodb_merge_threshold_secondary.inc
DROP TABLE tab1;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

4
mysql-test/suite/innodb/t/innodb-16k.test
View File

@ -3,6 +3,9 @@
--source include/have_innodb.inc
--source include/have_innodb_16k.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
call mtr.add_suppression("InnoDB: Cannot add field .* in table");
let $MYSQLD_DATADIR= `select @@datadir`;
@ -457,6 +460,7 @@ DROP TABLE t1;
--source include/wait_all_purged.inc
SET GLOBAL innodb_compression_level=@save_level;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge;
DROP TABLE tlong;

1
mysql-test/suite/innodb/t/innodb-32k.test
View File

@ -3,6 +3,7 @@
--source include/have_innodb.inc
--source include/have_innodb_32k.inc
SET GLOBAL innodb_stats_persistent = 0;
call mtr.add_suppression("Innodb: Cannot add field.*row size is");
let $MYSQLD_DATADIR= `select @@datadir`;

5
mysql-test/suite/innodb/t/innodb-system-table-view.test
View File

@ -4,6 +4,9 @@
--source include/innodb_page_size_small.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
LET $MYSQLD_DATADIR = `select @@datadir`;
LET $INNODB_PAGE_SIZE = `select @@innodb_page_size`;
@ -144,3 +147,5 @@ DROP TABLE parent;
--echo # temporary tablespace information
--echo #
SELECT SPACE FROM INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES WHERE name like 'innodb_temporary';
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

2
mysql-test/suite/innodb/t/innodb_scrub.test
View File

@ -4,7 +4,7 @@
let $MYSQLD_DATADIR=`select @@datadir`;
CREATE TABLE t1(f1 int auto_increment primary key,
f2 varchar(256),
f3 text) engine = innodb;
f3 text) engine = innodb stats_persistent=0;
let $numinserts = 500;
--disable_query_log
begin;

2
mysql-test/suite/innodb/t/innodb_stats_persistent.test
View File

@ -49,7 +49,7 @@ SELECT COUNT(*) FROM t2;
connection con1;
EXPLAIN SELECT * FROM t2 WHERE val=4;
--source include/wait_all_purged.inc
SET GLOBAL innodb_max_purge_lag_wait=0;
--echo # After COMMIT and purge, the DELETE must show up.
EXPLAIN SELECT * FROM t1 WHERE val=4;

4
mysql-test/suite/innodb/t/instant_alter.test
View File

@ -3,6 +3,9 @@
let $datadir=`select @@datadir`;
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
--echo #
--echo # MDEV-11369: Instant ADD COLUMN for InnoDB
--echo #
@ -964,3 +967,4 @@ remove_file $datadir/test/mdev28822_100427_innodb.frm;
copy_file std_data/mysql_upgrade/mdev28822_100427_innodb.frm $datadir/test/mdev28822_100427_innodb.frm;
ALTER TABLE mdev28822_100427_innodb ADD i1 INTEGER, ALGORITHM=INSTANT;
DROP TABLE mdev28822_100427_innodb;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

7
mysql-test/suite/innodb/t/instant_alter_bugs.test
View File

@ -1,5 +1,8 @@
--source include/have_innodb.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
--echo #
--echo # MDEV-17821 Assertion `!page_rec_is_supremum(rec)' failed
--echo # in btr_pcur_store_position
@ -527,3 +530,7 @@ ALTER TABLE t1 ADD COLUMN i INT GENERATED ALWAYS AS (1), DROP COLUMN i;
DROP TABLE t1;
--echo # End of 10.4 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--echo # End of 10.6 tests

7
mysql-test/suite/innodb/t/instant_alter_debug.test
View File

@ -3,6 +3,9 @@
--source include/have_debug_sync.inc
--source include/have_sequence.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET @old_instant=
(SELECT variable_value FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column');
@ -607,3 +610,7 @@ SET DEBUG_SYNC=RESET;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--echo # End of 10.6 tests

2
mysql-test/suite/innodb/t/instant_alter_purge.test
View File

@ -14,7 +14,7 @@ connect (prevent_purge,localhost,root);
START TRANSACTION WITH CONSISTENT SNAPSHOT;
connection default;
CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB;
CREATE TABLE t1 (f1 INT, f2 INT) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 () VALUES ();
ALTER TABLE t1 DROP f2, ADD COLUMN f2 INT;
ALTER TABLE t1 DROP f1;

2
mysql-test/suite/innodb/t/instant_alter_rollback.test
View File

@ -3,6 +3,8 @@
# The embedded server tests do not support restarting.
--source include/not_embedded.inc
SET GLOBAL innodb_stats_persistent = 0;
# Flush any open myisam tables from previous tests
FLUSH TABLES;

2
mysql-test/suite/innodb/t/page_id_innochecksum.test
View File

@ -6,7 +6,7 @@ let MYSQLD_BASEDIR= `SELECT @@basedir`;
let MYSQLD_DATADIR= `SELECT @@datadir`;
let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
create table t1(f1 int not null)engine=innodb;
create table t1(f1 int not null)engine=innodb stats_persistent=0;
insert into t1 values(1), (2), (3);
let $resultlog=$MYSQLTEST_VARDIR/tmp/result.log;

5
mysql-test/suite/innodb/t/purge.test
View File

@ -1,6 +1,9 @@
--source include/have_innodb.inc
--source include/have_innodb_16k.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
--echo # Bug #12429576 - Test an assertion failure on purge.
CREATE TABLE t1_purge (
A int,
@ -110,4 +113,6 @@ SHOW CREATE TABLE t12963823;
# We need to activate the purge thread before DROP TABLE.
-- source include/wait_all_purged.inc
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
DROP TABLE t1_purge, t2_purge, t3_purge, t4_purge, t12637786, t12963823;

7
mysql-test/suite/innodb/t/purge_secondary.test
View File

@ -1,6 +1,9 @@
--source include/have_innodb.inc
--source include/have_sequence.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
--disable_query_log
call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");
--enable_query_log
@ -170,3 +173,7 @@ UNLOCK TABLES;
DROP TABLE t1;
--echo # End of 10.3 tests
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;
--echo # End of 10.6 tests

2
mysql-test/suite/innodb/t/scrub_debug.test
View File

@ -10,7 +10,7 @@ SET GLOBAL INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=2;
let $MYSQLD_DATADIR=`select @@datadir`;
CREATE TABLE t1(f1 INT AUTO_INCREMENT PRIMARY KEY,
f2 VARCHAR(256) GENERATED ALWAYS as('repairman'),
INDEX idx(f2))ENGINE= InnoDB;
INDEX idx(f2))ENGINE= InnoDB STATS_PERSISTENT=0;
INSERT INTO t1(f1) SELECT seq FROM seq_1_to_50;
FLUSH TABLE t1 FOR EXPORT;
let SEARCH_PATTERN= repairman;

2
mysql-test/suite/innodb/t/truncate_crash.test
View File

@ -4,7 +4,7 @@
--source include/not_embedded.inc
FLUSH TABLES;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB;
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 VALUES (1),(2);
connect (wait,localhost,root,,test);

2
mysql-test/suite/innodb/t/trx_id_future.test
View File

@ -8,7 +8,7 @@
let PAGE_SIZE=`select @@innodb_page_size`;
CREATE TABLE t1(a INT) row_format=redundant engine=innoDB;
CREATE TABLE t1(a INT) row_format=redundant engine=innoDB stats_persistent=0;
INSERT INTO t1 VALUES(1);
let MYSQLD_DATADIR=`select @@datadir`;

5
mysql-test/suite/innodb/t/undo_log.test
View File

@ -1,5 +1,8 @@
--source include/have_innodb.inc
SET @save_stats_persistent = @@GLOBAL.innodb_stats_persistent;
SET GLOBAL innodb_stats_persistent = 0;
SET innodb_strict_mode=OFF;
CREATE TABLE test_tab (
a_str_18 mediumtext,
@ -151,3 +154,5 @@ ROLLBACK;
--source include/wait_all_purged.inc
DROP TABLE t1;
DROP TABLE t2;
SET GLOBAL innodb_stats_persistent = @save_stats_persistent;

1
mysql-test/suite/innodb/t/undo_space_dblwr.opt
View File

@ -1,2 +1,3 @@
--innodb_undo_tablespaces=3
--innodb_sys_tablespaces
--innodb-stats-persistent=0

2
mysql-test/suite/innodb_fts/r/crash_recovery.result
View File

@ -33,7 +33,7 @@ connection default;
disconnect ddl1;
disconnect ddl2;
disconnect ddl3;
InnoDB 0 transactions not purged
SET GLOBAL innodb_max_purge_lag_wait=0;
CHECK TABLE t1,t2,t3;
Table Op Msg_type Msg_text
test.t1 check status OK

2
mysql-test/suite/innodb_fts/t/crash_recovery.test
View File

@ -113,7 +113,7 @@ disconnect ddl3;
# Wait for purge, so that any #sql-ib.ibd files from the previous kill
# will be deleted.
source ../../innodb/include/wait_all_purged.inc;
SET GLOBAL innodb_max_purge_lag_wait=0;
CHECK TABLE t1,t2,t3;
DROP TABLE t1,t2,t3;

2
mysql-test/suite/innodb_gis/r/rtree_add_index.result
View File

@ -1,4 +1,4 @@
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB;
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 VALUES ('');
connect purge_control,localhost,root;
START TRANSACTION WITH CONSISTENT SNAPSHOT;

6
mysql-test/suite/innodb_gis/r/rtree_compress.result
View File

@ -1,4 +1,6 @@
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED;
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED STATS_PERSISTENT=0;
lock tables t1 write;
start transaction;
insert into t1 values(1, Point(1,1));
insert into t1 values(2, Point(2,2));
insert into t1 values(3, Point(3,3));
@ -18,6 +20,8 @@ insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
commit;
unlock tables;
start transaction;
insert into t1 select * from t1;
select count(*) from t1;

2
mysql-test/suite/innodb_gis/r/rtree_purge.result
View File

@ -1,5 +1,5 @@
create table t (
b point not null,d point not null, spatial key (d),spatial key (b)
) engine=innodb;
) engine=innodb stats_persistent=0;
InnoDB 0 transactions not purged
drop table t;

12
mysql-test/suite/innodb_gis/r/rtree_undo.result
View File

File diff suppressed because one or more lines are too long

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

@ -1,6 +1,6 @@
--source include/have_innodb.inc
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB;
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 VALUES ('');
connect purge_control,localhost,root;

6
mysql-test/suite/innodb_gis/t/rtree_compress.test
View File

@ -10,9 +10,11 @@
# Valgrind takes too much time on PB2 even in the --big-test runs.
--source include/not_valgrind.inc
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED;
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED STATS_PERSISTENT=0;
# Insert enough values to let R-tree split.
lock tables t1 write;
start transaction;
insert into t1 values(1, Point(1,1));
insert into t1 values(2, Point(2,2));
insert into t1 values(3, Point(3,3));
@ -33,6 +35,8 @@ insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
commit;
unlock tables;
start transaction;
insert into t1 select * from t1;
select count(*) from t1;

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

@ -8,7 +8,7 @@
create table t (
b point not null,d point not null, spatial key (d),spatial key (b)
) engine=innodb;
) engine=innodb stats_persistent=0;
--disable_query_log
set @p=point(1,1);

4
mysql-test/suite/innodb_gis/t/rtree_undo.test
View File

@ -17,7 +17,7 @@ CREATE TABLE t1 (
p INT NOT NULL AUTO_INCREMENT,
g LINESTRING NOT NULL,
PRIMARY KEY(p)
) ENGINE=InnoDB;
) ENGINE=InnoDB STATS_PERSISTENT=0;
if ($index == 3) {
eval ALTER TABLE t1 ADD INDEX prefix_idx (g($prefix_size));
@ -88,7 +88,7 @@ CREATE TABLE t2 (
SPATIAL KEY (g4),
SPATIAL KEY (g5),
SPATIAL KEY (g6)
) ENGINE=InnoDB;
) ENGINE=InnoDB STATS_PERSISTENT=0;
DROP TABLE t1,t2;

2
mysql-test/suite/innodb_zip/r/blob.result
View File

@ -3,7 +3,7 @@
# failed in mtr_t::write(), btr_free_externally_stored_field()
#
CREATE TABLE t1 (c TEXT, f2 INT PRIMARY KEY, f3 INT UNIQUE)
ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
ENGINE=InnoDB STATS_PERSISTENT=0 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
SET @level= @@GLOBAL.innodb_compression_level;
SET GLOBAL innodb_compression_level=0;
connect prevent_purge,localhost,root;

2
mysql-test/suite/innodb_zip/t/blob.test
View File

@ -6,7 +6,7 @@
--echo #
CREATE TABLE t1 (c TEXT, f2 INT PRIMARY KEY, f3 INT UNIQUE)
ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
ENGINE=InnoDB STATS_PERSISTENT=0 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
SET @level= @@GLOBAL.innodb_compression_level;
SET GLOBAL innodb_compression_level=0;

3
mysql-test/suite/mariabackup/unencrypted_page_compressed.result
View File

@ -1,5 +1,6 @@
call mtr.add_suppression("InnoDB: Table `test`.`t1` has an unreadable root page");
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200)) ENGINE=InnoDB page_compressed=yes;
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200))
ENGINE=InnoDB PAGE_COMPRESSED=YES STATS_PERSISTENT=0;
insert into t1(b, c) values("mariadb", "mariabackup");
InnoDB 0 transactions not purged
# Corrupt the table

3
mysql-test/suite/mariabackup/unencrypted_page_compressed.test
View File

@ -1,5 +1,6 @@
call mtr.add_suppression("InnoDB: Table `test`.`t1` has an unreadable root page");
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200)) ENGINE=InnoDB page_compressed=yes;
CREATE TABLE t1 (a INT AUTO_INCREMENT PRIMARY KEY, b TEXT, c char(200))
ENGINE=InnoDB PAGE_COMPRESSED=YES STATS_PERSISTENT=0;
insert into t1(b, c) values("mariadb", "mariabackup");
--source ../innodb/include/wait_all_purged.inc

3
mysql-test/suite/parts/r/partition_alter_innodb.result
View File

@ -71,7 +71,8 @@ DROP TABLE t1;
#
# MDEV-28079 Shutdown hangs after altering innodb partition fts table
#
CREATE TABLE t1(f1 INT, f2 CHAR(100))ENGINE=InnoDB PARTITION BY HASH(f1) PARTITIONS 2;
CREATE TABLE t1(f1 INT, f2 CHAR(100))ENGINE=InnoDB STATS_PERSISTENT=0
PARTITION BY HASH(f1) PARTITIONS 2;
ALTER TABLE t1 ADD FULLTEXT(f2);
InnoDB 0 transactions not purged
DROP TABLE t1;

2
mysql-test/suite/parts/r/partition_purge.result
View File

@ -1,4 +1,4 @@
CREATE TABLE t1(f1 INT, f2 INT, INDEX(f1))ENGINE=InnoDB
CREATE TABLE t1(f1 INT, f2 INT, INDEX(f1))ENGINE=InnoDB STATS_PERSISTENT=0
PARTITION BY LIST(f1) (
PARTITION p1 VALUES in (1, 2, 3),
PARTITION p2 VALUES in (4, 5, 6));

3
mysql-test/suite/parts/t/partition_alter_innodb.test
View File

@ -12,7 +12,8 @@ SET GLOBAL innodb_read_only_compressed=@save_innodb_read_only_compressed;
--echo #
--echo # MDEV-28079 Shutdown hangs after altering innodb partition fts table
--echo #
CREATE TABLE t1(f1 INT, f2 CHAR(100))ENGINE=InnoDB PARTITION BY HASH(f1) PARTITIONS 2;
CREATE TABLE t1(f1 INT, f2 CHAR(100))ENGINE=InnoDB STATS_PERSISTENT=0
PARTITION BY HASH(f1) PARTITIONS 2;
ALTER TABLE t1 ADD FULLTEXT(f2);
--source ../innodb/include/wait_all_purged.inc
DROP TABLE t1;

2
mysql-test/suite/parts/t/partition_purge.test
View File

@ -3,7 +3,7 @@
--source include/have_debug.inc
--source include/have_debug_sync.inc
CREATE TABLE t1(f1 INT, f2 INT, INDEX(f1))ENGINE=InnoDB
CREATE TABLE t1(f1 INT, f2 INT, INDEX(f1))ENGINE=InnoDB STATS_PERSISTENT=0
PARTITION BY LIST(f1) (
PARTITION p1 VALUES in (1, 2, 3),
PARTITION p2 VALUES in (4, 5, 6));

4
mysql-test/suite/versioning/r/delete_history.result
View File

@ -193,7 +193,7 @@ drop table t1;
# MDEV-25004 Missing row in FTS_DOC_ID_INDEX during DELETE HISTORY
#
create table t1 (a integer, c0 varchar(255), fulltext key (c0))
with system versioning engine innodb;
with system versioning engine innodb stats_persistent=0;
set system_versioning_alter_history= keep;
alter table t1 drop system versioning;
alter table t1 add system versioning;
@ -203,7 +203,7 @@ InnoDB 0 transactions not purged
delete history from t1;
drop table t1;
create table t1 (id int primary key, ftx varchar(255))
with system versioning engine innodb;
with system versioning engine innodb stats_persistent=0;
insert into t1 values (1, 'c');
delete from t1;
alter table t1 add fulltext key(ftx);

4
mysql-test/suite/versioning/t/delete_history.test
View File

@ -195,7 +195,7 @@ drop table t1;
--echo # MDEV-25004 Missing row in FTS_DOC_ID_INDEX during DELETE HISTORY
--echo #
create table t1 (a integer, c0 varchar(255), fulltext key (c0))
with system versioning engine innodb;
with system versioning engine innodb stats_persistent=0;
set system_versioning_alter_history= keep;
alter table t1 drop system versioning;
alter table t1 add system versioning;
@ -206,7 +206,7 @@ delete history from t1;
drop table t1;
create table t1 (id int primary key, ftx varchar(255))
with system versioning engine innodb;
with system versioning engine innodb stats_persistent=0;
insert into t1 values (1, 'c');
delete from t1;
alter table t1 add fulltext key(ftx);