Skip to content

M
MariaDB
Commit 3e90efe4 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.6 into 10.11

parents a48c1b89 2f467de4
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 28 deletions
mysql-test/suite/innodb/r/innodb-index-online.result
View file @ 3e90efe4
SET GLOBAL innodb_monitor_reset_all=all;
SET GLOBAL innodb_monitor_reset_all=default;
call mtr.add_suppression("InnoDB: Warning: Small buffer pool size"); call mtr.add_suppression("InnoDB: Warning: Small buffer pool size");
SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table; SET @global_innodb_file_per_table_orig = @@global.innodb_file_per_table;
SET GLOBAL innodb_file_per_table = on; SET GLOBAL innodb_file_per_table = on;
...@@ -155,6 +157,7 @@ test t1_c2_stats GEN_CLUST_INDEX LAST_UPDATE size 1 NULL Number of pages in the ...@@ -155,6 +157,7 @@ test t1_c2_stats GEN_CLUST_INDEX LAST_UPDATE size 1 NULL Number of pages in the
connection con1; connection con1;
KILL QUERY @id; KILL QUERY @id;
ERROR 70100: Query execution was interrupted ERROR 70100: Query execution was interrupted
SET GLOBAL innodb_max_purge_lag_wait=0;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2d_created WAIT_FOR kill_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2d_created WAIT_FOR kill_done';
CREATE INDEX c2d ON t1(c2); CREATE INDEX c2d ON t1(c2);
connection default; connection default;
...@@ -221,13 +224,13 @@ t1 CREATE TABLE `t1` ( ...@@ -221,13 +224,13 @@ t1 CREATE TABLE `t1` (
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=1 ) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci STATS_PERSISTENT=1
connection default; connection default;
SET @merge_encrypt_0= SET @merge_encrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_0= SET @merge_decrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_0= SET @rowlog_encrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
connection con1; connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2e_created WAIT_FOR dml2_done';
...@@ -274,13 +277,13 @@ name pos ...@@ -274,13 +277,13 @@ name pos
c2 0 c2 0
c3 1 c3 1
SET @merge_encrypt_1= SET @merge_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_1= SET @merge_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_1= SET @rowlog_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SELECT SELECT
(@merge_encrypt_1-@merge_encrypt_0)- (@merge_encrypt_1-@merge_encrypt_0)-
...@@ -320,16 +323,16 @@ ddl_pending_alter_table 0 ...@@ -320,16 +323,16 @@ ddl_pending_alter_table 0
ddl_sort_file_alter_table 0 ddl_sort_file_alter_table 0
ddl_log_file_alter_table 1 ddl_log_file_alter_table 1
SET @merge_encrypt_1= SET @merge_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_1= SET @merge_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_1= SET @rowlog_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SET @rowlog_decrypt_1= SET @rowlog_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
connection con1; connection con1;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
...@@ -405,16 +408,16 @@ ddl_sort_file_alter_table 0 ...@@ -405,16 +408,16 @@ ddl_sort_file_alter_table 0
ddl_log_file_alter_table 2 ddl_log_file_alter_table 2
connection default; connection default;
SET @merge_encrypt_2= SET @merge_encrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_2= SET @merge_decrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_2= SET @rowlog_encrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SET @rowlog_decrypt_2= SET @rowlog_decrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
SELECT SELECT
(@merge_encrypt_2-@merge_encrypt_1)- (@merge_encrypt_2-@merge_encrypt_1)-
......
mysql-test/suite/innodb/t/innodb-index-online.test
View file @ 3e90efe4
...@@ -4,6 +4,10 @@ ...@@ -4,6 +4,10 @@
--source include/have_debug_sync.inc --source include/have_debug_sync.inc
--source include/no_valgrind_without_big.inc --source include/no_valgrind_without_big.inc
SET GLOBAL innodb_monitor_reset_all=all;
--disable_warnings
SET GLOBAL innodb_monitor_reset_all=default;
--enable_warnings
let $innodb_metrics_select= let $innodb_metrics_select=
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl'; SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
...@@ -158,6 +162,7 @@ let $ID= `SELECT @id := CONNECTION_ID()`; ...@@ -158,6 +162,7 @@ let $ID= `SELECT @id := CONNECTION_ID()`;
--error ER_QUERY_INTERRUPTED --error ER_QUERY_INTERRUPTED
KILL QUERY @id; KILL QUERY @id;
SET GLOBAL innodb_max_purge_lag_wait=0;
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2d_created WAIT_FOR kill_done'; SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2d_created WAIT_FOR kill_done';
--send --send
CREATE INDEX c2d ON t1(c2); CREATE INDEX c2d ON t1(c2);
...@@ -209,13 +214,13 @@ SHOW CREATE TABLE t1; ...@@ -209,13 +214,13 @@ SHOW CREATE TABLE t1;
connection default; connection default;
SET @merge_encrypt_0= SET @merge_encrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_0= SET @merge_decrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_0= SET @rowlog_encrypt_0=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
connection con1; connection con1;
...@@ -254,13 +259,13 @@ INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_FIELDS sf ...@@ -254,13 +259,13 @@ INNER JOIN INFORMATION_SCHEMA.INNODB_SYS_FIELDS sf
ON si.index_id = sf.index_id WHERE si.name = '?c2e'; ON si.index_id = sf.index_id WHERE si.name = '?c2e';
SET @merge_encrypt_1= SET @merge_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_1= SET @merge_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_1= SET @rowlog_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SELECT SELECT
...@@ -297,16 +302,16 @@ ALTER TABLE t1 COMMENT 'testing if c2e will be dropped'; ...@@ -297,16 +302,16 @@ ALTER TABLE t1 COMMENT 'testing if c2e will be dropped';
eval $innodb_metrics_select; eval $innodb_metrics_select;
SET @merge_encrypt_1= SET @merge_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_1= SET @merge_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_1= SET @rowlog_encrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SET @rowlog_decrypt_1= SET @rowlog_decrypt_1=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
connection con1; connection con1;
...@@ -343,16 +348,16 @@ eval $innodb_metrics_select; ...@@ -343,16 +348,16 @@ eval $innodb_metrics_select;
connection default; connection default;
SET @merge_encrypt_2= SET @merge_encrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_encrypted');
SET @merge_decrypt_2= SET @merge_decrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_merge_blocks_decrypted');
SET @rowlog_encrypt_2= SET @rowlog_encrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_encrypted');
SET @rowlog_decrypt_2= SET @rowlog_decrypt_2=
(SELECT variable_value FROM information_schema.global_status (SELECT CAST(variable_value AS INTEGER) FROM information_schema.global_status
WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted'); WHERE variable_name = 'innodb_encryption_n_rowlog_blocks_decrypted');
SELECT SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7