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

Merge 10.3 into 10.4

We disable the MDEV-21189 test galera.galera_partition
because it times out.
This commit is contained in:
Marko Mäkelä
2019-12-13 17:30:37 +02:00
121 changed files with 4286 additions and 3753 deletions

View File

@@ -1,5 +1,4 @@
SET GLOBAL innodb_purge_rseg_truncate_frequency=1;
SET GLOBAL innodb_fast_shutdown=0;
SET @save_enabled= @@GLOBAL.innodb_cmp_per_index_enabled;
SET GLOBAL innodb_cmp_per_index_enabled=ON;
SELECT * FROM information_schema.innodb_cmp_per_index;
CREATE TABLE t (
@@ -72,34 +71,5 @@ index_name PRIMARY
compress_ops 65
compress_ops_ok 65
uncompress_ops 0
# restart
SHOW CREATE TABLE t;
Table t
Create Table CREATE TABLE `t` (
`a` int(11) NOT NULL,
`b` varchar(512) DEFAULT NULL,
`c` varchar(16) DEFAULT NULL,
PRIMARY KEY (`a`),
KEY `b` (`b`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
SET GLOBAL innodb_cmp_per_index_enabled=ON;
SELECT COUNT(*) FROM t IGNORE INDEX(b);
COUNT(*) 128
SELECT
database_name,
table_name,
index_name,
compress_ops,
compress_ops_ok,
CASE WHEN uncompress_ops=6 and @@innodb_compression_level IN (4,8,9) THEN 9
ELSE uncompress_ops END as uncompress_ops
FROM information_schema.innodb_cmp_per_index
ORDER BY 1, 2, 3;
database_name test
table_name t
index_name PRIMARY
compress_ops 0
compress_ops_ok 0
uncompress_ops 4
DROP TABLE t;
SET GLOBAL innodb_cmp_per_index_enabled=default;
SET GLOBAL innodb_cmp_per_index_enabled=@save_enabled;