mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 23:25:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 10.7 into 10.8

Browse source 
Closes #2083
This commit is contained in:
Daniel Black 2022-04-06 14:23:20 +10:00
commit 7b06bc9a94
26 changed files with 298 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/mariabackup/binlog.result
View file

@ -3,6 +3,6 @@ INSERT INTO t VALUES(1);
SHOW VARIABLES like 'log_bin';
Variable_name Value
log_bin ON
FOUND 1 /Last binlog file .*, position .*/ in current_test
FOUND 1 /Last binlog file .+, position \d+/ in current_test
# expect FOUND
DROP TABLE t;

2
mysql-test/suite/mariabackup/binlog.test
View file

@ -15,7 +15,7 @@ exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --backup --target-dir
exec $XTRABACKUP --prepare --binlog-info=1 --target-dir=$basedir ;
let SEARCH_FILE=$MYSQLTEST_VARDIR/log/current_test;
--let SEARCH_PATTERN= Last binlog file .*, position .*
--let SEARCH_PATTERN= Last binlog file .+, position \d+
--source include/search_pattern_in_file.inc
--echo # expect FOUND