MDEV-18650: Options deprecated in previous versions - thread_concurrency

thread_concurrency was ignored since 5.5. Remove it.

3 files changed, 8 insertions, 26 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 08332672715..4493bd3dd3e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -459,7 +459,7 @@ Atomic_counter<uint32_t> thread_count;
 bool shutdown_wait_for_slaves;
 int32 slave_open_temp_tables;
 ulong thread_created;
-ulong back_log, connect_timeout, concurrency, server_id;
+ulong back_log, connect_timeout, server_id;
 ulong what_to_log;
 ulong slow_launch_time;
 ulong open_files_limit, max_binlog_size;
@@ -5050,6 +5050,10 @@ static int init_server_components()
          compatibility, but do not have any effect otherwise, they behave
          as if supplied with --loose. Whenever a deprecated option is removed
          it should be appended here. */
+      {"thread-concurrency", OPT_DEPRECATED_OPTION, "",
+       0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
+      {"timed-mutexes", OPT_DEPRECATED_OPTION, "",
+       0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
       {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
     };
     /*
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index 83b5c628e3d..fc5b11b0150 100644
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -2863,23 +2863,6 @@ static Sys_var_charptr Sys_socket(
        READ_ONLY GLOBAL_VAR(mysqld_unix_port), CMD_LINE(REQUIRED_ARG),
        IN_FS_CHARSET, DEFAULT(0));
 
-/* 
-  thread_concurrency is a no-op on all platforms since
-  MySQL 5.1.  It will be removed in the context of
-  WL#5265
-*/
-static Sys_var_ulong Sys_thread_concurrency(
-       "thread_concurrency",
-       "Permits the application to give the threads system a hint for "
-       "the desired number of threads that should be run at the same time."
-       "This variable has no effect, and is deprecated. "
-       "It will be removed in a future release.",
-       READ_ONLY GLOBAL_VAR(concurrency),
-       CMD_LINE(REQUIRED_ARG, OPT_THREAD_CONCURRENCY),
-       VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED("")); // since 5.5.37
-
 static Sys_var_ulonglong Sys_thread_stack(
        "thread_stack", "The stack size for each thread",
        READ_ONLY GLOBAL_VAR(my_thread_stack_size), CMD_LINE(REQUIRED_ARG),
@@ -3894,13 +3877,6 @@ static Sys_var_ulonglong Sys_tmp_disk_table_size(
        DEFAULT((ulonglong)~(intptr)0),
        BLOCK_SIZE(1));
 
-static Sys_var_mybool Sys_timed_mutexes(
-       "timed_mutexes",
-       "Specify whether to time mutexes. Deprecated, has no effect.",
-       GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0),
-       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
-       DEPRECATED("")); // since 5.5.39
-
 static Sys_var_charptr Sys_version(
        "version", "Server version number. It may also include a suffix "
        "with configuration or build information. -debug indicates "
diff --git a/sql/upgrade_conf_file.cc b/sql/upgrade_conf_file.cc
index 7219f948745..8f3295755ee 100644
--- a/sql/upgrade_conf_file.cc
+++ b/sql/upgrade_conf_file.cc
@@ -119,7 +119,9 @@ static const char *removed_variables[] =
 "rpl_recovery_rank",
 "sql_big_tables",
 "sql_low_priority_updates",
-"sql_max_join_size"
+"sql_max_join_size",
+"thread_concurrency",
+"timed_mutexes"
 };