MDEV-6999 Remove or deprecate unused variables

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

@@ -432,8 +432,7 @@ The following options may be given as the first argument:
  max_statement_time seconds will be aborted. The argument
  will be treated as a decimal value with microsecond
  precision.  A value of 0 (default) means no timeout
- --max-tmp-tables=#  Maximum number of temporary tables a client can keep open
- at a time
+ --max-tmp-tables=#  Unused, will be removed.
  --max-user-connections=# 
  The maximum number of active connections for a single
  user (0 = no limit)
@@ -858,8 +857,6 @@ The following options may be given as the first argument:
  --rowid-merge-buff-size=# 
  The size of the buffers used [NOT] IN evaluation via
  partial matching
- --rpl-recovery-rank=# 
- Unused, will be removed
  --safe-mode         Skip some optimize stages (for testing). Deprecated.
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
@@ -1322,7 +1319,6 @@ report-password (No default value)
 report-port 0
 report-user (No default value)
 rowid-merge-buff-size 8388608
-rpl-recovery-rank 0
 safe-user-create FALSE
 secure-auth FALSE
 secure-file-priv (No default value)

mysql-test/r/variables.result

@@ -20,7 +20,6 @@ set @my_myisam_max_sort_file_size =@@global.myisam_max_sort_file_size;
 set @my_net_buffer_length         =@@global.net_buffer_length;
 set @my_net_write_timeout         =@@global.net_write_timeout;
 set @my_net_read_timeout          =@@global.net_read_timeout;
-set @my_rpl_recovery_rank         =@@global.rpl_recovery_rank;
 set @my_server_id                 =@@global.server_id;
 set @my_slow_launch_time          =@@global.slow_launch_time;
 set @my_storage_engine            =@@global.default_storage_engine;
@@ -522,7 +521,6 @@ Warnings:
 Warning	1292	Truncated incorrect max_heap_table_size value: '100'
 set max_join_size=100;
 set max_sort_length=100;
-set max_tmp_tables=100;
 set global max_user_connections=100;
 select @@max_user_connections;
 @@max_user_connections
@@ -540,9 +538,6 @@ set read_buffer_size=100;
 Warnings:
 Warning	1292	Truncated incorrect read_buffer_size value: '100'
 set read_rnd_buffer_size=100;
-set global rpl_recovery_rank=100;
-Warnings:
-Warning	1287	'@@rpl_recovery_rank' is deprecated and will be removed in a future release.
 set global server_id=100;
 set global slow_launch_time=100;
 set sort_buffer_size=100;
@@ -1061,9 +1056,6 @@ Warnings:
 Warning	1708	The value of 'max_allowed_packet' should be no less than the value of 'net_buffer_length'
 set global net_write_timeout         =@my_net_write_timeout;
 set global net_read_timeout          =@my_net_read_timeout;
-set global rpl_recovery_rank         =@my_rpl_recovery_rank;
-Warnings:
-Warning	1287	'@@rpl_recovery_rank' is deprecated and will be removed in a future release.
 set global server_id                 =@my_server_id;
 set global slow_launch_time          =@my_slow_launch_time;
 set global default_storage_engine            =@my_storage_engine;

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

@@ -8,87 +8,123 @@ SELECT @start_session_value;
 32
 '#--------------------FN_DYNVARS_086_01-------------------------#'
 SET @@global.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
 SET @@session.max_tmp_tables = 1000;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32
 '#--------------------FN_DYNVARS_086_02-------------------------#'
 SET @@global.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables = 32;
 @@global.max_tmp_tables = 32
 1
 SET @@session.max_tmp_tables = DEFAULT;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables = 32;
 @@session.max_tmp_tables = 32
 1
 '#--------------------FN_DYNVARS_086_03-------------------------#'
 SET @@global.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
 SET @@global.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 2
 SET @@global.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 65536
 SET @@global.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
 SET @@global.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967294
 '#--------------------FN_DYNVARS_086_04-------------------------#'
 SET @@session.max_tmp_tables = 1;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
 SET @@session.max_tmp_tables = 2;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 2
 SET @@session.max_tmp_tables = 65536;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 65536
 SET @@session.max_tmp_tables = 4294967295;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
 SET @@session.max_tmp_tables = 4294967294;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967294
 '#------------------FN_DYNVARS_086_05-----------------------#'
 SET @@global.max_tmp_tables = -1024;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1024'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
 SET @@global.max_tmp_tables = 4294967296;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 4294967295
 SET @@global.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
 SET @@global.max_tmp_tables = 429496729500;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
@@ -105,24 +141,28 @@ SELECT @@global.max_tmp_tables;
 4294967295
 SET @@session.max_tmp_tables = 4294967296;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '4294967296'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
 SET @@session.max_tmp_tables = -1;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 1
 SET @@session.max_tmp_tables = 429496729500;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '429496729500'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 4294967295
 SET @@session.max_tmp_tables = -001;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '-1'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
@@ -131,6 +171,7 @@ SET @@session.max_tmp_tables = 65530.34;
 ERROR 42000: Incorrect argument type to variable 'max_tmp_tables'
 SET @@session.max_tmp_tables = 10737418241;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '10737418241'
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
@@ -154,22 +195,29 @@ WHERE VARIABLE_NAME='max_tmp_tables';
 1
 '#------------------FN_DYNVARS_086_08-----------------------#'
 SET @@global.max_tmp_tables = TRUE;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
 SET @@global.max_tmp_tables = FALSE;
 Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 Warning	1292	Truncated incorrect max_tmp_tables value: '0'
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 1
 '#---------------------FN_DYNVARS_086_09----------------------#'
 SET @@global.max_tmp_tables = 20;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@global.max_tmp_tables;
 @@max_tmp_tables = @@global.max_tmp_tables
 0
 '#---------------------FN_DYNVARS_086_10----------------------#'
 SET @@max_tmp_tables = 255;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables = @@local.max_tmp_tables;
 @@max_tmp_tables = @@local.max_tmp_tables
 1
@@ -178,6 +226,8 @@ SELECT @@local.max_tmp_tables = @@session.max_tmp_tables;
 1
 '#---------------------FN_DYNVARS_086_11----------------------#'
 SET max_tmp_tables = 102;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@max_tmp_tables;
 @@max_tmp_tables
 102
@@ -188,10 +238,14 @@ ERROR 42S02: Unknown table 'session' in field list
 SELECT max_tmp_tables = @@session.max_tmp_tables;
 ERROR 42S22: Unknown column 'max_tmp_tables' in 'field list'
 SET @@global.max_tmp_tables = @start_global_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@global.max_tmp_tables;
 @@global.max_tmp_tables
 32
 SET @@session.max_tmp_tables = @start_session_value;
+Warnings:
+Warning	1287	'@@max_tmp_tables' is deprecated and will be removed in a future release.
 SELECT @@session.max_tmp_tables;
 @@session.max_tmp_tables
 32