Merge branch 'mysql-8.0' into mysql-trunk

Author: phulakun

mysql-test/r/flush2.result

@@ -1,14 +1,14 @@
 select @@GLOBAL.relay_log_info_repository into @save_relay_log_info_repository;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 set @@GLOBAL.relay_log_info_repository = 'FILE';
 Warnings:
 Warning	1287	'FILE' is deprecated and will be removed in a future release. Please use 'TABLE' instead
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 show variables like 'log_bin%';
 Variable_name	Value
 log_bin	OFF
@@ -47,4 +47,4 @@ relay_log_space_limit	0
 set @@GLOBAL.relay_log_info_repository = @save_relay_log_info_repository;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.

mysql-test/r/log_components_notwin.result

@@ -18,54 +18,54 @@ logging to syseventlog
 logging to syseventlog
 SET @start_value= @@global.log_syslog;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= DEFAULT;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SELECT @@global.log_syslog;
 @@global.log_syslog
 1
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= 0;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SELECT @@global.log_syslog;
 @@global.log_syslog
 0
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= 1;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SELECT @@global.log_syslog;
 @@global.log_syslog
 1
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= ON;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SELECT @@global.log_syslog;
 @@global.log_syslog
 1
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= OFF;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SELECT @@global.log_syslog;
 @@global.log_syslog
 0
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @@global.log_syslog= 9;
 ERROR 42000: Variable 'log_syslog' can't be set to the value of '9'
 SELECT @@global.log_syslog;
 @@global.log_syslog
 0
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET GLOBAL log_syslog= 0.01;
 ERROR 42000: Incorrect argument type to variable 'log_syslog'
 SET SESSION log_syslog= 0;
@@ -74,7 +74,7 @@ SET LOCAL log_syslog= 0;
 ERROR HY000: Variable 'log_syslog' is a GLOBAL variable and should be set with SET GLOBAL
 SET @@global.log_syslog= @start_value;
 Warnings:
-Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead
+Warning	1287	'@@log_syslog' is deprecated and will be removed in a future release. Please use --log_error_services instead.
 SET @start_value= @@global.log_syslog_facility;
 SET @@global.log_syslog_facility= DEFAULT;
 SELECT @@global.log_syslog_facility, @start_value;

mysql-test/r/variables.result

@@ -1385,20 +1385,20 @@ 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
+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	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
+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
+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;
@@ -1408,33 +1408,33 @@ 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
+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	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
+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
+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
+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
+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
+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 auto_increment_offset=-1;
 Warnings:

mysql-test/suite/binlog/r/binlog_expire_logs_days_deprecation.result

@@ -59,4 +59,4 @@ include/assert.inc [The value of binlog_expire_logs_seconds is changed to 259200
 SET GLOBAL binlog_expire_logs_seconds= 2592000;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.

mysql-test/suite/binlog/r/binlog_expire_logs_seconds.result

@@ -5,7 +5,7 @@ CALL mtr.add_suppression("The option expire_logs_days cannot be used together*")
 SET GLOBAL binlog_expire_logs_seconds= 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 CREATE TABLE t1(s LONGBLOB );
 Case:0
 FLUSH LOGS;
@@ -40,7 +40,7 @@ Testing with smaller values of binlog_expire_logs_seconds
 SET GLOBAL binlog_expire_logs_seconds= 30;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 FLUSH LOGS;
 FLUSH LOGS;
 FLUSH LOGS;
@@ -49,7 +49,7 @@ Testing with greater values of binlog_expire_logs_seconds
 SET GLOBAL binlog_expire_logs_seconds= 3600;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 CREATE TABLE t1(s LONGBLOB );
 Case:0
 FLUSH LOGS;
@@ -83,7 +83,7 @@ RESET MASTER;
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 CREATE TABLE t1(s LONGBLOB );
 Case:0
 FLUSH LOGS;
@@ -114,4 +114,4 @@ RESET MASTER;
 SET GLOBAL binlog_expire_logs_seconds= 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.

mysql-test/suite/rpl/r/rpl_lock_backup_binary_and_relay_logs.result

@@ -8,11 +8,11 @@ include/sync_slave_sql_with_master.inc
 [connection master]
 SET @saved_expire_logs_days= @@GLOBAL.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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 SET @saved_binlog_expire_logs_seconds= @@GLOBAL.binlog_expire_logs_seconds;
 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
+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= 1;
 [connection master1]
 LOCK INSTANCE FOR BACKUP;
@@ -54,5 +54,5 @@ SHOW RELAYLOG EVENTS IN 'LAST_RELAY_LOG_FILE';
 SET @@GLOBAL.binlog_expire_logs_seconds= @saved_binlog_expire_logs_seconds;
 SET @@GLOBAL.expire_logs_days= @saved_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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 include/rpl_end.inc

mysql-test/suite/sys_vars/r/binlog_expire_logs_seconds_basic.result

@@ -1,12 +1,12 @@
 SET @start_value = @@global.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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 SELECT @start_value;
 @start_value
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 SET @start_value_sec = @@global.binlog_expire_logs_seconds;
 SELECT @start_value_sec;
 @start_value_sec
@@ -117,9 +117,9 @@ SELECT @@global.binlog_expire_logs_seconds;
 2592000
 SET @@global.expire_logs_days = @start_value;
 Warnings:
-Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.
 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
+Warning	1287	'@@expire_logs_days' is deprecated and will be removed in a future release. Please use binlog_expire_logs_seconds instead.