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.10 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2022-09-07 10:14:41 +03:00
parent 90608bd649 6978bcbf37
commit 3ec4241b00
24 changed files with 542 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/innodb/t/innodb-index-online.test
View File

@@ -312,9 +312,7 @@ connection con1;
# Accumulate and apply some modification log.
SET DEBUG_SYNC = 'row_log_apply_before SIGNAL c2f_created WAIT_FOR dml3_done';
--send
# FIXME: MDEV-13668
#ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
ALTER TABLE t1 ADD INDEX c2f(c2);
ALTER TABLE t1 ADD INDEX c2f(c22f), CHANGE c2 c22f INT;
connection default;
SET DEBUG_SYNC = 'now WAIT_FOR c2f_created';
@@ -338,8 +336,6 @@ SET DEBUG_SYNC = 'now SIGNAL dml3_done';
connection con1;
reap;
# FIXME: MDEV-13668
ALTER TABLE t1 CHANGE c2 c22f INT;
eval $innodb_metrics_select;

6
mysql-test/suite/innodb/t/leaf_page_corrupted_during_recovery.test
View File

@@ -49,8 +49,8 @@ EOF
--error ER_UNKNOWN_STORAGE_ENGINE
SELECT * FROM t1 WHERE PK = 1;
# We will disable also purge, to not let it request the corrupted page.
let $restart_parameters=--innodb-force-recovery=2;
# Force recovery to ignore the corrupted page.
let $restart_parameters=--innodb-force-recovery=1;
--source include/restart_mysqld.inc
SELECT * FROM t1 WHERE PK = 1;
--error ER_NOT_KEYFILE
@@ -58,5 +58,3 @@ SELECT * FROM t1 WHERE pk = 12;
CHECK TABLE t1;
DROP TABLE t1;
let $restart_parameters=;
--source include/restart_mysqld.inc