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 branch '11.5' into 11.6

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-21 13:28:32 +02:00
parent 10b885907a 342fa29615
commit 492a7c2430
107 changed files with 2996 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View File

@@ -70,8 +70,6 @@ master-bin.000002 #
master-bin.000003 #
SELECT @time_for_purge:=DATE_ADD('tmpval', INTERVAL 1 SECOND);
purge master logs before (@time_for_purge);
Warnings:
Note 1375 Binary log 'master-bin.000003' is not purged because it is the current active binlog
show binary logs;
Log_name File_size
master-bin.000003 #

5
mysql-test/suite/rpl/t/rpl_rotate_logs.test
View File

@@ -134,7 +134,12 @@ remove_file $MYSQLTEST_VARDIR/tmp/rpl_rotate_logs.tmp;
--eval SELECT @time_for_purge:=DATE_ADD('$tmpval', INTERVAL 1 SECOND)
--enable_result_log
# Disable the warning "is not purged because it is the current active binlog".
# This warning will appear or not, depending on whether the timestamp of
# master-bin.000003 ends up earlier than @time_for_purge or not in the test run.
--disable_warnings
purge master logs before (@time_for_purge);
--enable_warnings
source include/show_binary_logs.inc;
insert into t2 values (65);
sync_slave_with_master;