MDEV-18650: Options deprecated in previous versions - multi_range_count

Remove deprecated system variable multi_range_count. It was ignored from 5.3.
MariaDB · Feb 13, 2020 · ad17aa1 · ad17aa1
1 parent 5aebd78
commit ad17aa1
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 499 deletions.
diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
@@ -616,8 +616,6 @@ The following specify which files/extra groups are read (specified before remain
  Don't write queries to slow log that examine fewer rows
  than that
  --mrr-buffer-size=# Size of buffer to use when using MRR with range access
- --multi-range-count=# 
- Ignored. Use mrr_buffer_size instead
  --myisam-block-size=# 
  Block size to be used for MyISAM index pages
  --myisam-data-pointer-size=# 
@@ -1582,7 +1580,6 @@ metadata-locks-cache-size 1024
 metadata-locks-hash-instances 8
 min-examined-row-limit 0
 mrr-buffer-size 262144
-multi-range-count 256
 myisam-block-size 1024
 myisam-data-pointer-size 6
 myisam-max-sort-file-size 9223372036853727232

diff --git a/mysql-test/suite/sys_vars/r/multi_range_count_basic.result b/mysql-test/suite/sys_vars/r/multi_range_count_basic.result
diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2043,16 +2043,6 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	MULTI_RANGE_COUNT
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
-NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_BLOCK_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2203,16 +2203,6 @@ NUMERIC_BLOCK_SIZE	1
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
 COMMAND_LINE_ARGUMENT	REQUIRED
-VARIABLE_NAME	MULTI_RANGE_COUNT
-VARIABLE_SCOPE	SESSION
-VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Ignored. Use mrr_buffer_size instead
-NUMERIC_MIN_VALUE	1
-NUMERIC_MAX_VALUE	18446744073709551615
-NUMERIC_BLOCK_SIZE	1
-ENUM_VALUE_LIST	NULL
-READ_ONLY	NO
-COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_BLOCK_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED