diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 10:17:58 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 10:17:58 +0200 |
| commit | 67a6ad0a4a36bd59fabbdd6b1cdd38de54e82c79 (patch) | |
| tree | 0c1e66f56778a7698b5f0455b288364090322534 | |
| parent | 201cfc33e671705dc0f452fc69a98e3a09de61eb (diff) | |
| parent | d3f35aa47bc3ee0c9b2798555f9a79057895809a (diff) | |
| download | mariadb-git-67a6ad0a4a36bd59fabbdd6b1cdd38de54e82c79.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | mysql-test/suite/innodb/r/recovery_memory.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/recovery_memory.test | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/r/recovery_memory.result b/mysql-test/suite/innodb/r/recovery_memory.result index 6faea097616..9aba9bccdb3 100644 --- a/mysql-test/suite/innodb/r/recovery_memory.result +++ b/mysql-test/suite/innodb/r/recovery_memory.result @@ -22,7 +22,7 @@ DROP PROCEDURE dorepeat; SET DEBUG_DBUG="+d,ib_log_checkpoint_avoid_hard"; CREATE TABLE t1(f1 INT NOT NULL)ENGINE=InnoDB; INSERT INTO t1 SELECT * FROM seq_1_to_65536; -# restart: --innodb_buffer_pool_size=5242880 --debug_dbug=+d,ibuf_init_corrupt +# restart: with restart_parameters # restart SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/suite/innodb/t/recovery_memory.test b/mysql-test/suite/innodb/t/recovery_memory.test index e723ba25d36..145b39d56f6 100644 --- a/mysql-test/suite/innodb/t/recovery_memory.test +++ b/mysql-test/suite/innodb/t/recovery_memory.test @@ -1,6 +1,7 @@ --source include/have_innodb.inc --source include/big_test.inc --source include/have_sequence.inc +--source include/maybe_debug.inc call mtr.add_suppression("InnoDB: The change buffer is corrupted"); call mtr.add_suppression("InnoDB: Plugin initialization aborted at srv0start.cc"); call mtr.add_suppression("Plugin 'InnoDB' init function returned error"); @@ -30,12 +31,20 @@ DROP PROCEDURE dorepeat; --echo # MDEV-30552 InnoDB recovery crashes when error --echo # handling scenario --echo # +if ($have_debug) { SET DEBUG_DBUG="+d,ib_log_checkpoint_avoid_hard"; +let $restart_parameters=--innodb_buffer_pool_size=5242880 --debug_dbug="+d,ibuf_init_corrupt"; +} +if (!$have_debug) { +--echo SET DEBUG_DBUG="+d,ib_log_checkpoint_avoid_hard"; +let $restart_parameters=--innodb_buffer_pool_size=5242880; +} CREATE TABLE t1(f1 INT NOT NULL)ENGINE=InnoDB; INSERT INTO t1 SELECT * FROM seq_1_to_65536; +let $restart_noprint=1; let $shutdown_timeout=0; -let $restart_parameters=--innodb_buffer_pool_size=5242880 --debug_dbug="+d,ibuf_init_corrupt"; --source include/restart_mysqld.inc +let $restart_noprint=0; let $restart_parameters=; --source include/restart_mysqld.inc SHOW CREATE TABLE t1; |