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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2021-01-25 15:06:52 +02:00
parent 961c7938bb e626f511f9
commit 927a882341
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -381,11 +381,6 @@ a b
1 1 1 1
DROP TABLE t1; DROP TABLE t1;
SET debug_dbug = @save_dbug; SET debug_dbug = @save_dbug;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
instants
28
# #
# MDEV-24512 Assertion failed in rec_is_metadata() # MDEV-24512 Assertion failed in rec_is_metadata()
# in btr_discard_only_page_on_level() # in btr_discard_only_page_on_level()
@@ -441,3 +436,8 @@ DROP TABLE t1;
SET DEBUG_SYNC=RESET; SET DEBUG_SYNC=RESET;
# End of 10.5 tests # End of 10.5 tests
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency; SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
instants
32

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

@@ -233,6 +233,7 @@ connection default;
SET DEBUG_SYNC = 'now WAIT_FOR copied'; SET DEBUG_SYNC = 'now WAIT_FOR copied';
let $wait_all_purged = 1; let $wait_all_purged = 1;
--source include/wait_all_purged.inc --source include/wait_all_purged.inc
let $wait_all_purged = 0;
INSERT INTO t1 SET a=1; INSERT INTO t1 SET a=1;
INSERT INTO t1 SET a=2,b=3,c=4; INSERT INTO t1 SET a=2,b=3,c=4;
SET DEBUG_SYNC = 'now SIGNAL logged'; SET DEBUG_SYNC = 'now SIGNAL logged';
@@ -260,6 +261,7 @@ connection default;
SET DEBUG_SYNC = 'now WAIT_FOR copied'; SET DEBUG_SYNC = 'now WAIT_FOR copied';
let $wait_all_purged = 1; let $wait_all_purged = 1;
--source include/wait_all_purged.inc --source include/wait_all_purged.inc
let $wait_all_purged = 0;
INSERT INTO t1 SET a=1; INSERT INTO t1 SET a=1;
INSERT INTO t1 SET a=2,c=4; INSERT INTO t1 SET a=2,c=4;
SET DEBUG_SYNC = 'now SIGNAL logged'; SET DEBUG_SYNC = 'now SIGNAL logged';
@@ -430,10 +432,6 @@ DROP TABLE t1;
SET debug_dbug = @save_dbug; SET debug_dbug = @save_dbug;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';
--echo # --echo #
--echo # MDEV-24512 Assertion failed in rec_is_metadata() --echo # MDEV-24512 Assertion failed in rec_is_metadata()
--echo # in btr_discard_only_page_on_level() --echo # in btr_discard_only_page_on_level()
@@ -501,3 +499,7 @@ SET DEBUG_SYNC=RESET;
--echo # End of 10.5 tests --echo # End of 10.5 tests
SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency; SET GLOBAL innodb_purge_rseg_truncate_frequency = @save_frequency;
SELECT variable_value-@old_instant instants
FROM information_schema.global_status
WHERE variable_name = 'innodb_instant_alter_column';