WL#11006: Remove expire-logs-days

Neha Kumari · Neha Kumari · commit 9a432edc8881 · 2023-08-21T06:48:43.000+02:00
Post-push fix:

Removed an unwanted line from
mysql-test/suite/binlog/t/binlog_expire_logs_seconds.test
It was inserted while merging with mysql-trunk.

Change-Id: I930a96f0554a3cfcfde820a8841467147efa5ab7
diff --git a/mysql-test/suite/binlog/t/binlog_expire_logs_seconds.test b/mysql-test/suite/binlog/t/binlog_expire_logs_seconds.test
@@ -5,7 +5,6 @@
 # The test case test the following:
 #
 # 1. If binlog_expire_logs_seconds == 0 no purge happens.
->>>>>>> db6b0d683a3... WL#11006: Remove expire-logs-days
 #
 # 2. Verifies that if binlog_expire_logs_seconds > 0 then it
 #    purges the binary logs older than the timeout and keeps

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`# The test case test the following:`
`6`	`6`	`#`
`7`	`7`	`# 1. If binlog_expire_logs_seconds == 0 no purge happens.`
`8`		`->>>>>>> db6b0d683a3... WL#11006: Remove expire-logs-days`
`9`	`8`	`#`
`10`	`9`	`# 2. Verifies that if binlog_expire_logs_seconds > 0 then it`
`11`	`10`	`# purges the binary logs older than the timeout and keeps`