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 branch '10.6' into 10.11

Browse Source
This commit is contained in:
Sergei Golubchik
2024-04-22 11:00:03 +02:00
parent 75488a57f2 e83d92ee5e
commit 018d537ec1
418 changed files with 7074 additions and 2930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mysql-test/suite/innodb/r/monitor.result
View File

@@ -196,6 +196,7 @@ icp_attempts disabled
icp_no_match disabled
icp_out_of_range disabled
icp_match disabled
create temporary table orig_innodb_metrics as select name, enabled from information_schema.innodb_metrics;
set global innodb_monitor_disable = All;
select name from information_schema.innodb_metrics where enabled;
name
@@ -429,7 +430,7 @@ set global innodb_monitor_reset_all = default;
# MONITORS
#
CREATE TABLE t1 (a INT PRIMARY KEY) ENGINE=InnoDB STATS_PERSISTENT=0;
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*1*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 0
@@ -437,13 +438,13 @@ SET GLOBAL innodb_monitor_enable='module_buffer_page';
INSERT INTO t1 VALUES (1), (2), (3), (4);
FLUSH TABLES t1 FOR EXPORT;
UNLOCK TABLES;
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*2*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 1
SET GLOBAL innodb_monitor_disable='module_buffer_page';
SET GLOBAL innodb_monitor_reset_all='module_buffer_page';
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*3*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 0
@@ -453,13 +454,13 @@ ERROR 42000: Variable 'innodb_compression_algorithm' can't be set to the value o
INSERT INTO t1 VALUES (5), (6), (7), (8);
FLUSH TABLES t1 FOR EXPORT;
UNLOCK TABLES;
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*4*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 1
SET GLOBAL innodb_monitor_disable='%';
SET GLOBAL innodb_monitor_reset_all='%';
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*5*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 0
@@ -467,7 +468,7 @@ SET GLOBAL innodb_monitor_enable='ALL';
INSERT INTO t1 VALUES (9), (10), (11), (12);
FLUSH TABLES t1 FOR EXPORT;
UNLOCK TABLES;
SELECT NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
SELECT /*6*/ NAME, COUNT > 0 FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE NAME
LIKE 'buffer_page_written_index_leaf';
NAME COUNT > 0
buffer_page_written_index_leaf 1
@@ -597,6 +598,41 @@ DROP TABLE t1;
DROP TABLE fl2;
DROP TABLE fl1;
DROP TABLE fl0;
SET GLOBAL innodb_monitor_enable=default;
SET GLOBAL innodb_monitor_disable=default;
SET GLOBAL innodb_monitor_reset_all=default;
set global innodb_monitor_disable = 'adaptive\\_hash\\_p%';
set global innodb_monitor_disable = 'adaptive\\_hash\\_r%';
set global innodb_monitor_disable = 'buffer\\_LRU\\_batch\\_n%';
set global innodb_monitor_disable = 'buffer\\_LRU\\_batch\\_s%';
set global innodb_monitor_disable = 'buffer\\_LRU\\_g%';
set global innodb_monitor_disable = 'buffer\\_LRU\\_s%';
set global innodb_monitor_disable = 'buffer\\_LRU\\_u%';
set global innodb_monitor_disable = 'buffer\\_f%';
set global innodb_monitor_disable = 'buffer\\_page\\_%';
set global innodb_monitor_disable = 'c%';
set global innodb_monitor_disable = 'ddl%';
set global innodb_monitor_disable = 'icp%';
set global innodb_monitor_disable = 'index\\_p%';
set global innodb_monitor_disable = 'innodb\\_di%';
set global innodb_monitor_disable = 'innodb\\_l%';
set global innodb_monitor_disable = 'innodb\\_m%';
set global innodb_monitor_disable = 'lock\\_re%';
set global innodb_monitor_disable = 'lock\\_ta%';
set global innodb_monitor_disable = 'log%';
set global innodb_monitor_disable = 'm%';
set global innodb_monitor_disable = 'p%';
set global innodb_monitor_disable = 't%';
set global innodb_monitor_enable = 'log\\_w%';
set global innodb_monitor_enable = 'trx_rseg_history_len';
set global innodb_monitor_enable = 'trx_undo_slots_cached';
set global innodb_monitor_enable=default;
Warnings:
Warning 1230 Default value is not defined for this set option. Please specify correct counter or module name.
set global innodb_monitor_disable=default;
Warnings:
Warning 1230 Default value is not defined for this set option. Please specify correct counter or module name.
set global innodb_monitor_reset_all=default;
Warnings:
Warning 1230 Default value is not defined for this set option. Please specify correct counter or module name.
select name, orig.enabled, new.enabled from
orig_innodb_metrics orig join information_schema.innodb_metrics new using(name)
where orig.enabled != new.enabled;
name enabled enabled