mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge 10.5 into 10.6
This commit is contained in:
Marko Mäkelä
@@ -92,3 +92,69 @@ SELECT * FROM t1;
|
||||
SHOW CREATE TABLE t1;
|
||||
DROP TABLE t1;
|
||||
SET DEBUG_SYNC='RESET';
|
||||
|
||||
--echo #
|
||||
--echo # MDEV-33593: Auto increment deadlock error causes ASSERT in subsequent save point
|
||||
--echo #
|
||||
|
||||
CREATE TABLE t1(col1 INT PRIMARY KEY AUTO_INCREMENT, col2 INT) ENGINE=InnoDB;
|
||||
CREATE TABLE t2(col1 INT PRIMARY KEY) ENGINE=InnoDB;
|
||||
INSERT INTO t1(col2) values(100);
|
||||
|
||||
--connect(con1, localhost, root,,)
|
||||
START TRANSACTION;
|
||||
--echo # T1: Acquiring Row X lock on table t2
|
||||
INSERT INTO t2 values(100);
|
||||
|
||||
--connect(con2, localhost, root,,)
|
||||
START TRANSACTION;
|
||||
--echo # T2: Wait for (T1) row lock on t2 after acquiring GAP Lock on t1
|
||||
UPDATE t1 SET col2 = 20 where col1 = 10;
|
||||
SET DEBUG_SYNC='lock_wait_before_suspend SIGNAL t2_waiting';
|
||||
--send INSERT INTO t2 values(100)
|
||||
|
||||
--connection default
|
||||
SET DEBUG_SYNC='now WAIT_FOR t2_waiting';
|
||||
--echo # T3: Wait for (T2) II row Lock on t1 after acquiring Auto Increment Lock on t1
|
||||
SET DEBUG_SYNC='lock_wait_before_suspend SIGNAL t3_waiting';
|
||||
--send INSERT INTO t1(col2) SELECT col2 from t1
|
||||
|
||||
--connection con1
|
||||
SAVEPOINT s1;
|
||||
SET DEBUG_SYNC='now WAIT_FOR t3_waiting';
|
||||
--echo # T1: Wait for (T3) auto increment lock on t1 causing T1 -> T3 -> T2 -> T1 deadlock
|
||||
SET debug_dbug = '+d,innodb_deadlock_victim_self';
|
||||
--error ER_AUTOINC_READ_FAILED
|
||||
INSERT INTO t1(col2) VALUES(200);
|
||||
|
||||
--echo # The transaction should have been rolled back
|
||||
SELECT * FROM t1;
|
||||
SELECT * FROM t2;
|
||||
|
||||
--echo # Release the previous savepoint using the same name
|
||||
SAVEPOINT s1;
|
||||
COMMIT;
|
||||
|
||||
--connection con2
|
||||
--reap
|
||||
COMMIT;
|
||||
|
||||
--connection default
|
||||
--reap
|
||||
COMMIT;
|
||||
|
||||
--disconnect con1
|
||||
--disconnect con2
|
||||
|
||||
--echo # Cleanup
|
||||
SELECT * FROM t1;
|
||||
DROP TABLE t1;
|
||||
|
||||
SELECT * FROM t2;
|
||||
DROP TABLE t2;
|
||||
|
||||
SET DEBUG_SYNC='RESET';
|
||||
|
||||
--echo #
|
||||
--echo # End of 10.5 tests
|
||||
--echo #
|
||||
|
||||
91
mysql-test/suite/innodb/t/log_upgrade_101_flags.test
Normal file
91
mysql-test/suite/innodb/t/log_upgrade_101_flags.test
Normal file
@@ -0,0 +1,91 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/big_test.inc
|
||||
--source include/not_embedded.inc
|
||||
call mtr.add_suppression("InnoDB: The change buffer is corrupted");
|
||||
call mtr.add_suppression("InnoDB: Tablespace size stored in header is 768 pages, but the sum of data file sizes is 384 pages");
|
||||
call mtr.add_suppression("InnoDB: adjusting FSP_SPACE_FLAGS of file");
|
||||
--source include/shutdown_mysqld.inc
|
||||
let bugdir= $MYSQLTEST_VARDIR/tmp/log_upgrade;
|
||||
--mkdir $bugdir
|
||||
--let SEARCH_FILE = $MYSQLTEST_VARDIR/log/mysqld.1.err
|
||||
--let $dirs= --innodb-data-home-dir=$bugdir --innodb-log-group-home-dir=$bugdir
|
||||
|
||||
# Test case similar to log_upgrade.test
|
||||
perl;
|
||||
do "$ENV{MTR_SUITE_DIR}/../innodb/include/crc32.pl";
|
||||
my $polynomial = 0x82f63b78; # CRC-32C
|
||||
|
||||
die unless open OUT, ">", "$ENV{bugdir}/ibdata1";
|
||||
binmode OUT;
|
||||
|
||||
my $head = pack("Nx[18]", 0);
|
||||
# Add FSP_SPACE_FLAGS as 49152 (10.1.0...10.1.20), page_size = 32k
|
||||
my $body = pack("x[8]Nx[4]Nx[2]Nx[32696]", 768, 49152, 97937874);
|
||||
my $ck = mycrc32($head, 0, $polynomial) ^ mycrc32($body, 0, $polynomial);
|
||||
print OUT pack("N",$ck).$head.pack("x[12]").$body.pack("Nx[4]",$ck);
|
||||
# Dummy pages 1..6.
|
||||
print OUT chr(0) x (6 * 32768);
|
||||
# Dictionary header page (page 7).
|
||||
$head = pack("Nx[18]", 7);
|
||||
$body = pack("x[32]Nx[8]Nx[32674]", 8, 9);
|
||||
$ck = mycrc32($head, 0, $polynomial) ^ mycrc32($body, 0, $polynomial);
|
||||
print OUT pack("N",$ck).$head.pack("x[12]").$body.pack("Nx[4]",$ck);
|
||||
|
||||
# Empty SYS_TABLES page (page 8).
|
||||
$head = pack("NNNx[8]n", 8, ~0, ~0, 17855);
|
||||
$body = pack("nnx[31]Cx[20]", 2, 124, 1);
|
||||
$body .= pack("nxnn", 0x801, 3, 116) . "infimum";
|
||||
$body .= pack("xnxnxx", 0x901, 0x803) . "supremum";
|
||||
$body .= pack("x[32632]nn", 116, 101);
|
||||
$ck = mycrc32($head, 0, $polynomial) ^ mycrc32($body, 0, $polynomial);
|
||||
print OUT pack("N",$ck).$head.pack("x[12]").$body.pack("Nx[4]",$ck);
|
||||
|
||||
# Empty SYS_INDEXES page (page 9).
|
||||
$head = pack("NNNx[8]n", 9, ~0, ~0, 17855);
|
||||
$body = pack("nnx[31]Cx[20]", 2, 124, 3);
|
||||
$body .= pack("nxnn", 0x801, 3, 116) . "infimum";
|
||||
$body .= pack("xnxnxx", 0x901, 0x803) . "supremum";
|
||||
$body .= pack("x[32632]nn", 116, 101);
|
||||
$ck = mycrc32($head, 0, $polynomial) ^ mycrc32($body, 0, $polynomial);
|
||||
print OUT pack("N",$ck).$head.pack("x[12]").$body.pack("Nx[4]",$ck);
|
||||
|
||||
die unless seek(OUT, 768 * 16384 - 1, 0);
|
||||
print OUT chr(0);
|
||||
close OUT or die;
|
||||
|
||||
die unless open OUT, ">", "$ENV{bugdir}/ib_logfile0";
|
||||
binmode OUT;
|
||||
$_= pack("Nx[5]nx[5]", 1, 0x1286) . "BogoDB 4.3.2.1" . chr(0) x 478;
|
||||
print OUT $_, pack("N", mycrc32($_, 0, $polynomial));
|
||||
# checkpoint page 1 and all-zero checkpoint 2
|
||||
$_= pack("x[13]nCNNx[484]", 0x1286, 12, 2, 0x80c);
|
||||
print OUT $_, pack("N", mycrc32($_, 0, $polynomial));
|
||||
die unless seek(OUT, 0x1FFFFFFFF, 0);
|
||||
print OUT chr(0);
|
||||
close OUT or die;
|
||||
die unless open OUT, ">", "$ENV{bugdir}/ib_logfile1";
|
||||
binmode OUT;
|
||||
die unless seek(OUT, 0x800, 0); # the first 2048 bytes are unused!
|
||||
$_= pack("Nnnx[500]", 0x80000944, 12, 12);
|
||||
print OUT $_, pack("N", mycrc32($_, 0, $polynomial));
|
||||
die unless seek(OUT, 0x1FFFFFFFF, 0);
|
||||
print OUT chr(0);
|
||||
close OUT or die;
|
||||
EOF
|
||||
|
||||
--let $restart_parameters= $dirs --innodb-force-recovery=5 --innodb-log-file-size=4m --innodb_page_size=32k --innodb_buffer_pool_size=10M
|
||||
--source include/start_mysqld.inc
|
||||
SELECT COUNT(*) FROM INFORMATION_SCHEMA.ENGINES
|
||||
WHERE engine = 'innodb'
|
||||
AND support IN ('YES', 'DEFAULT', 'ENABLED');
|
||||
--source include/shutdown_mysqld.inc
|
||||
--let SEARCH_PATTERN= InnoDB: Upgrading redo log:
|
||||
--source include/search_pattern_in_file.inc
|
||||
--let $restart_parameters= $dirs
|
||||
|
||||
--remove_files_wildcard $bugdir
|
||||
--rmdir $bugdir
|
||||
--let $restart_parameters=
|
||||
--source include/start_mysqld.inc
|
||||
|
||||
--echo # End of 10.5 tests
|
||||
@@ -32,17 +32,22 @@ DROP DATABASE abc_def;
|
||||
|
||||
DROP DATABASE abc_def2;
|
||||
|
||||
call mtr.add_suppression("InnoDB: (Operating system error|The error means|Cannot rename file)");
|
||||
call mtr.add_suppression("InnoDB: Cannot rename '.*t1.ibd' to '.*non_existing_db.*' because the target schema directory doesn't exist");
|
||||
|
||||
CREATE TABLE t1 (a INT) ENGINE=InnoDB;
|
||||
INSERT INTO t1 VALUES(100);
|
||||
--replace_result "\\" "/"
|
||||
--error ER_ERROR_ON_RENAME
|
||||
RENAME TABLE t1 TO non_existing_db.t1;
|
||||
|
||||
--let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot rename file '.*t1\.ibd' to '.*non_existing_db
|
||||
--let SEARCH_PATTERN= \[ERROR\] InnoDB: Cannot rename '.*t1\.ibd' to '.*non_existing_db
|
||||
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err;
|
||||
--source include/search_pattern_in_file.inc
|
||||
|
||||
SET GLOBAL innodb_fast_shutdown=2;
|
||||
--source include/restart_mysqld.inc
|
||||
|
||||
SELECT * FROM t1;
|
||||
# Cleanup
|
||||
DROP TABLE t1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user