WL#11006: Remove expire-logs-days

In this worklog we remove all the codes and tests related to
system variable expire_logs_days.

Change-Id: Ie19403460df7975c04b268fb00ff7a93fe61967d

Author: Neha Kumari

mysql-test/extra/binlog_tests/binlog_expire_warnings.inc

@@ -46,17 +46,17 @@ include/assert.inc [Expect 500+ variables in the table. Due to open Bugs, we are
 
 # Test SET PERSIST
 
-include/assert.inc [Expect 449 persisted variables in the table.]
+include/assert.inc [Expect 448 persisted variables in the table.]
 
 ************************************************************
 * 3. Restart server, it must preserve the persisted variable
 *    settings. Verify persisted configuration.
 ************************************************************
 # restart
 
-include/assert.inc [Expect 449 persisted variables in persisted_variables table.]
-include/assert.inc [Expect 449 persisted variables shown as PERSISTED in variables_info table.]
-include/assert.inc [Expect 449 persisted variables with matching peristed and global values.]
+include/assert.inc [Expect 448 persisted variables in persisted_variables table.]
+include/assert.inc [Expect 448 persisted variables shown as PERSISTED in variables_info table.]
+include/assert.inc [Expect 448 persisted variables with matching peristed and global values.]
 
 ************************************************************
 * 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

mysql-test/r/all_persisted_variables.result

@@ -1,16 +1,12 @@
 select @@GLOBAL.relay_log_info_repository into @save_relay_log_info_repository;
 Warnings:
 Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
-select @@GLOBAL.expire_logs_days into @save_expire_logs_days;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
+select @@GLOBAL.binlog_expire_logs_seconds into @save_binlog_expire_logs_seconds;
 set @@GLOBAL.relay_log_info_repository = 'FILE';
 Warnings:
 Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
 flush logs;
-set global expire_logs_days = 3;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
+set global binlog_expire_logs_seconds = 259200;
 show variables like 'log_bin%';
 Variable_name	Value
 log_bin	OFF
@@ -49,6 +45,4 @@ relay_log_space_limit	0
 set @@GLOBAL.relay_log_info_repository = @save_relay_log_info_repository;
 Warnings:
 Warning	1287	'@@relay_log_info_repository' is deprecated and will be removed in a future release.
-set @@GLOBAL.expire_logs_days = @save_expire_logs_days;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
+set @@GLOBAL.binlog_expire_logs_seconds = @save_binlog_expire_logs_seconds;

mysql-test/r/flush2.result

@@ -130,10 +130,8 @@ The following options may be given as the first argument:
  (Defaults to on; use --skip-binlog-expire-logs-auto-purge to disable.)
  --binlog-expire-logs-seconds=# 
  If non-zero, binary logs will be purged after
- binlog_expire_logs_seconds seconds; If both this option
- and expire_logs_days are set to non-zero  values, this
- option takes priority. Purges happen at startup and at
- binary log rotation.
+ binlog_expire_logs_seconds seconds; Purges happen at
+ startup and at binary log rotation.
  --binlog-format=name 
  The format used when writing the binary log. ROW writes
  each changed row in a binary format. STATEMENT writes SQL
@@ -364,14 +362,6 @@ The following options may be given as the first argument:
  and DISABLED (keep the event scheduler completely
  deactivated, it cannot be activated run-time)
  -T, --exit-info[=#] Used for debugging. Use at your own risk.
- --expire-logs-days=# 
- If non-zero, binary logs will be purged after
- expire_logs_days days; If this option alone is set on the
- command line or in a configuration file, it overrides the
- default value for binlog-expire-logs-seconds. If both
- options are set to nonzero values,
- binlog-expire-logs-seconds takes priority. Possible
- purges happen at startup and at binary log rotation.
  --explain-format[=name] 
  The default format in which the EXPLAIN statement
  displays information. Valid values are TRADITIONAL
@@ -1747,7 +1737,6 @@ end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
 eq-range-index-dive-limit 200
 event-scheduler ON
-expire-logs-days 0
 explain-format TRADITIONAL
 explicit-defaults-for-timestamp TRUE
 external-locking FALSE

mysql-test/r/mysqld--help-notwin.result

@@ -130,10 +130,8 @@ The following options may be given as the first argument:
  (Defaults to on; use --skip-binlog-expire-logs-auto-purge to disable.)
  --binlog-expire-logs-seconds=# 
  If non-zero, binary logs will be purged after
- binlog_expire_logs_seconds seconds; If both this option
- and expire_logs_days are set to non-zero  values, this
- option takes priority. Purges happen at startup and at
- binary log rotation.
+ binlog_expire_logs_seconds seconds; Purges happen at
+ startup and at binary log rotation.
  --binlog-format=name 
  The format used when writing the binary log. ROW writes
  each changed row in a binary format. STATEMENT writes SQL
@@ -363,14 +361,6 @@ The following options may be given as the first argument:
  and DISABLED (keep the event scheduler completely
  deactivated, it cannot be activated run-time)
  -T, --exit-info[=#] Used for debugging. Use at your own risk.
- --expire-logs-days=# 
- If non-zero, binary logs will be purged after
- expire_logs_days days; If this option alone is set on the
- command line or in a configuration file, it overrides the
- default value for binlog-expire-logs-seconds. If both
- options are set to nonzero values,
- binlog-expire-logs-seconds takes priority. Possible
- purges happen at startup and at binary log rotation.
  --explain-format[=name] 
  The default format in which the EXPLAIN statement
  displays information. Valid values are TRADITIONAL
@@ -1757,7 +1747,6 @@ end-markers-in-json FALSE
 enforce-gtid-consistency FALSE
 eq-range-index-dive-limit 200
 event-scheduler ON
-expire-logs-days 0
 explain-format TRADITIONAL
 explicit-defaults-for-timestamp TRUE
 external-locking FALSE

mysql-test/r/mysqld--help-win.result

@@ -1414,75 +1414,6 @@ SET @@session.thread_stack= 7;
 ERROR HY000: Variable 'thread_stack' is a read only variable
 SET @@global.thread_stack= 7;
 ERROR HY000: Variable 'thread_stack' is a read only variable
-SELECT @@global.binlog_expire_logs_seconds INTO @old_seconds;
-SET @@global.binlog_expire_logs_seconds = 0;
-SELECT @@global.expire_logs_days INTO @old_eld;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL expire_logs_days = -1;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-Warning	1292	Truncated incorrect expire_logs_days value: '-1'
-needs to've been adjusted (0)
-SELECT @@global.expire_logs_days;
-@@global.expire_logs_days
-0
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL expire_logs_days = 11;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET @old_mode=@@sql_mode;
-SET SESSION sql_mode = 'TRADITIONAL';
-SET GLOBAL expire_logs_days = 100;
-ERROR 42000: Variable 'expire_logs_days' can't be set to the value of '100'
-needs to be unchanged (11)
-SELECT @@global.expire_logs_days;
-@@global.expire_logs_days
-11
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET SESSION sql_mode = @old_mode;
-SET GLOBAL expire_logs_days = 100;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-Warning	1292	Truncated incorrect expire_logs_days value: '100'
-needs to've been adjusted (99)
-SELECT @@global.expire_logs_days;
-@@global.expire_logs_days
-99
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL expire_logs_days = 11;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL expire_logs_days = 99;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-needs to pass with no warnings (99)
-SELECT @@global.expire_logs_days;
-@@global.expire_logs_days
-99
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL expire_logs_days = @old_eld;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET GLOBAL binlog_expire_logs_seconds= @old_seconds;
-SET @@global.binlog_expire_logs_seconds=0;
-SET @@global.expire_logs_days = 1;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET @@global.binlog_expire_logs_seconds=5;
-ERROR HY000: The option expire_logs_days cannot be used together with option binlog_expire_logs_seconds. To set one, first unset the other by setting it to 0.
-SET @@global.expire_logs_days=0;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
-SET @@global.binlog_expire_logs_seconds=5;
-SET @@global.binlog_expire_logs_seconds=@old_seconds;
-SET @@global.expire_logs_days=@old_eld;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 SET GLOBAL auto_increment_offset=-1;
 Warnings:
 Warning	1292	Truncated incorrect auto_increment_offset value: '-1'

mysql-test/r/variables.result

@@ -1,21 +1,19 @@
 #
 # WL#9237: Add a new variable binlog_expire_logs_seconds
 
-# Here we will test purging of binary logs when either one or both of these variables are set
-# - binlog_expire_logs_seconds
-# - expire_logs_days
+# Here we will test purging of binary logs when - binlog_expire_logs_seconds
+# is set.
 
 # The three scenarios being tested for are:
 # 1. FLUSH LOGS
 # 2. Rotation of logs because of binlog growing bigger than max_binlog_size
 # 3. Server restart
 #
-# Usuage: --let $binlog_expire_logs_seconds=
-#         --let $expire_logs_days=
+# Usage: --let $binlog_expire_logs_seconds=
 #
 # --source suite/binlog/include/binlog_expire_logs_seconds.inc
 
---let $expire_logs_seconds= `SELECT @@global.binlog_expire_logs_seconds + @@global.expire_logs_days * 24 * 60 * 60`
+--let $expire_logs_seconds= `SELECT @@global.binlog_expire_logs_seconds`
 
 CREATE TABLE t1(s LONGBLOB );
 

mysql-test/suite/binlog/include/binlog_expire_logs_seconds.inc

@@ -1,6 +1,3 @@
-SET @@global.expire_logs_days = 0;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 SET @@global.binlog_expire_logs_auto_purge = OFF;
 FLUSH LOGS;
 FLUSH LOGS;
@@ -26,7 +23,4 @@ PURGE BINARY LOGS BEFORE 'DATE';
 FLUSH LOGS;
 SET GLOBAL binlog_expire_logs_seconds=2592000;
 SET GLOBAL binlog_expire_logs_auto_purge=1;
-SET GLOBAL expire_logs_days=0;
-Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 RESET BINARY LOGS AND GTIDS;