mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '11.7' into 11.8
This commit is contained in:
15
mysql-test/suite/encryption/r/recovery_memory.result
Normal file
15
mysql-test/suite/encryption/r/recovery_memory.result
Normal file
@@ -0,0 +1,15 @@
|
||||
CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
|
||||
set global innodb_fast_shutdown=0;
|
||||
# restart: --debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0
|
||||
set global debug_dbug="+d,ib_log_checkpoint_avoid_hard";
|
||||
INSERT INTO t1 SELECT repeat('a', 8000) FROM seq_1_to_1280;
|
||||
DELETE FROM t1;
|
||||
SET GLOBAL innodb_max_purge_lag_wait=0;
|
||||
INSERT INTO t1 VALUES('a');
|
||||
# XTRABACKUP PREPARE
|
||||
# restart
|
||||
SELECT COUNT(*) FROM t1;
|
||||
COUNT(*)
|
||||
1
|
||||
ALTER TABLE t1 FORCE;
|
||||
DROP TABLE t1;
|
@@ -4738,6 +4738,29 @@ w2_total w1_total u
|
||||
200 200 2
|
||||
DROP VIEW v1;
|
||||
DROP TABLE t1;
|
||||
#
|
||||
# MDEV-35869: degenerated subquery with window function
|
||||
#
|
||||
CREATE TABLE t1 (a int DEFAULT 10);
|
||||
INSERT INTO t1 VALUES (7), (2), (3);
|
||||
SELECT * FROM t1 WHERE (SELECT AVG(3)) > 2;
|
||||
a
|
||||
7
|
||||
2
|
||||
3
|
||||
SELECT * FROM t1 WHERE (SELECT AVG(3) OVER ()) > 2;
|
||||
a
|
||||
7
|
||||
2
|
||||
3
|
||||
INSERT INTO t1 VALUES((SELECT avg(4) OVER ()));
|
||||
SELECT * FROM t1;
|
||||
a
|
||||
7
|
||||
2
|
||||
3
|
||||
4
|
||||
DROP TABLE t1;
|
||||
# End of 10.5 tests
|
||||
#
|
||||
# MDEV-28206 SIGSEGV in Item_field::fix_fields when using LEAD...OVER
|
||||
|
@@ -1,7 +1,7 @@
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_debug.inc
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_example_key_management_plugin.inc
|
||||
--source include/have_file_key_management_plugin.inc
|
||||
call mtr.add_suppression("InnoDB: Encrypted page \\[page id: space=[1-9][0-9]*, page number=3\\] in file .*test.t[12]\\.ibd looks corrupted");
|
||||
call mtr.add_suppression("InnoDB: Unable to apply log to corrupted page ");
|
||||
call mtr.add_suppression("InnoDB: Plugin initialization aborted");
|
||||
|
8
mysql-test/suite/encryption/t/recovery_memory.opt
Normal file
8
mysql-test/suite/encryption/t/recovery_memory.opt
Normal file
@@ -0,0 +1,8 @@
|
||||
--innodb_doublewrite=0
|
||||
--innodb_log_file_size=24m
|
||||
--innodb_immediate_scrub_data_uncompressed=1
|
||||
--plugin-load-add=$FILE_KEY_MANAGEMENT_SO
|
||||
--loose-file-key-management
|
||||
--loose-file-key-management-filename=$MYSQL_TEST_DIR/std_data/logkey.txt
|
||||
--file-key-management-encryption-algorithm=aes_cbc
|
||||
--innodb-encrypt-log=1
|
45
mysql-test/suite/encryption/t/recovery_memory.test
Normal file
45
mysql-test/suite/encryption/t/recovery_memory.test
Normal file
@@ -0,0 +1,45 @@
|
||||
--source include/have_debug.inc
|
||||
--source include/have_innodb.inc
|
||||
--source include/have_sequence.inc
|
||||
--source filekeys_plugin.inc
|
||||
|
||||
let $basedir=$MYSQLTEST_VARDIR/tmp/backup;
|
||||
let MYSQLD_DATADIR=`select @@datadir`;
|
||||
|
||||
CREATE TABLE t1(f1 text, index idx(f1(20))) ENGINE INNODB;
|
||||
|
||||
# No checkpoint happens during this restart
|
||||
|
||||
let $shutdown_timeout=;
|
||||
set global innodb_fast_shutdown=0;
|
||||
let $restart_parameters=--debug_dbug=+d,ib_log_checkpoint_avoid_hard --innodb_flush_sync=0;
|
||||
--source include/restart_mysqld.inc
|
||||
set global debug_dbug="+d,ib_log_checkpoint_avoid_hard";
|
||||
|
||||
--disable_result_log
|
||||
exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir=$basedir;
|
||||
--enable_result_log
|
||||
|
||||
INSERT INTO t1 SELECT repeat('a', 8000) FROM seq_1_to_1280;
|
||||
DELETE FROM t1;
|
||||
SET GLOBAL innodb_max_purge_lag_wait=0;
|
||||
INSERT INTO t1 VALUES('a');
|
||||
|
||||
--echo # XTRABACKUP PREPARE
|
||||
exec $XTRABACKUP --prepare --target-dir=$basedir;
|
||||
|
||||
let $shutdown_timeout=0;
|
||||
--source include/shutdown_mysqld.inc
|
||||
|
||||
# Since there is no checkpoint during previous run, we can
|
||||
# Copy the datafile from t1.ibd and start the server
|
||||
|
||||
remove_file $MYSQLD_DATADIR/test/t1.ibd;
|
||||
copy_file $basedir/test/t1.ibd $MYSQLD_DATADIR/test/t1.ibd;
|
||||
--enable_result_log
|
||||
let $restart_parameters=;
|
||||
--source include/start_mysqld.inc
|
||||
|
||||
SELECT COUNT(*) FROM t1;
|
||||
ALTER TABLE t1 FORCE;
|
||||
DROP TABLE t1;
|
Reference in New Issue
Block a user