more "removed" mysqld command-line options

and put them all together in mysqld.cc

2 files changed, 65 insertions, 79 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index ebac83bc00d..34b524dffb2 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4571,6 +4571,22 @@ init_gtid_pos_auto_engines(void)
   return 0;
 }
 
+#define MYSQL_COMPATIBILITY_OPTION(option) \
+  { option, OPT_MYSQL_COMPATIBILITY, \
+   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
+
+#define MYSQL_TO_BE_IMPLEMENTED_OPTION(option) \
+  { option, OPT_MYSQL_TO_BE_IMPLEMENTED, \
+   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
+
+#define MYSQL_SUGGEST_ANALOG_OPTION(option, str) \
+  { option, OPT_MYSQL_COMPATIBILITY, \
+   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
+
+#define MARIADB_REMOVED_OPTION(option) \
+  { option, OPT_REMOVED_OPTION, \
+   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
+
 static int init_server_components()
 {
   DBUG_ENTER("init_server_components");
@@ -4923,26 +4939,54 @@ static int init_server_components()
     int ho_error;
     struct my_option removed_opts[]=
     {
-      /* All options in this list are accepted by the server for backwards
-         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. */
-      {"multi-range-count", OPT_DEPRECATED_OPTION, "",
-       0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
-      {"skip-bdb", OPT_DEPRECATED_OPTION, "",
-       0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-      {"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},
+      /* The following options exist in 5.6 but not in 10.0 */
+      MYSQL_COMPATIBILITY_OPTION("log-raw"),
+      MYSQL_COMPATIBILITY_OPTION("log-bin-use-v1-row-events"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("default-authentication-plugin"),
+      MYSQL_COMPATIBILITY_OPTION("binlog-max-flush-queue-time"),
+      MYSQL_COMPATIBILITY_OPTION("master-info-repository"),
+      MYSQL_COMPATIBILITY_OPTION("relay-log-info-repository"),
+      MYSQL_SUGGEST_ANALOG_OPTION("binlog-rows-query-log-events", "--binlog-annotate-row-events"),
+      MYSQL_COMPATIBILITY_OPTION("binlog-order-commits"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("log-throttle-queries-not-using-indexes"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("end-markers-in-json"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-features"),     // OPTIMIZER_TRACE
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-offset"),       // OPTIMIZER_TRACE
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-limit"),        // OPTIMIZER_TRACE
+      MYSQL_COMPATIBILITY_OPTION("server-id-bits"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("slave-rows-search-algorithms"), // HAVE_REPLICATION
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("slave-allow-batching"),         // HAVE_REPLICATION
+      MYSQL_COMPATIBILITY_OPTION("slave-checkpoint-period"),      // HAVE_REPLICATION
+      MYSQL_COMPATIBILITY_OPTION("slave-checkpoint-group"),       // HAVE_REPLICATION
+      MYSQL_SUGGEST_ANALOG_OPTION("slave-pending-jobs-size-max", "--slave-parallel-max-queued"),  // HAVE_REPLICATION
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("sha256-password-private-key-path"), // HAVE_OPENSSL
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("sha256-password-public-key-path"),  // HAVE_OPENSSL
+
+      /* The following options exist in 5.5 and 5.6 but not in 10.0 */
+      MYSQL_SUGGEST_ANALOG_OPTION("abort-slave-event-count", "--debug-abort-slave-event-count"),
+      MYSQL_SUGGEST_ANALOG_OPTION("disconnect-slave-event-count", "--debug-disconnect-slave-event-count"),
+      MYSQL_SUGGEST_ANALOG_OPTION("exit-info", "--debug-exit-info"),
+      MYSQL_SUGGEST_ANALOG_OPTION("max-binlog-dump-events", "--debug-max-binlog-dump-events"),
+      MYSQL_SUGGEST_ANALOG_OPTION("sporadic-binlog-dump-fail", "--debug-sporadic-binlog-dump-fail"),
+      MYSQL_COMPATIBILITY_OPTION("new"),
+      MYSQL_COMPATIBILITY_OPTION("show_compatibility_56"),
+
+      /* The following options were removed in 10.5 */
 #if defined(__linux__)
-      /*
-        Linux was the only large page OS that we've now removed the (always)
-        unused super-large-pages (because its Solaris only).
-      */
-      {"super-large-pages", OPT_DEPRECATED_OPTION, "",
-       0, 0, 0, GET_NO_ARG, OPT_ARG, 0, 0, 0, 0, 0, 0},
-#endif
+      MARIADB_REMOVED_OPTION("super-large-pages"),
+#endif
+      MARIADB_REMOVED_OPTION("innodb-locks-unsafe-for-binlog"),
+      MARIADB_REMOVED_OPTION("innodb-rollback-segments"),
+      MARIADB_REMOVED_OPTION("innodb-stats-sample-pages"),
+      MARIADB_REMOVED_OPTION("max-long-data-size"),
+      MARIADB_REMOVED_OPTION("multi-range-count"),
+      MARIADB_REMOVED_OPTION("skip-bdb"),
+      MARIADB_REMOVED_OPTION("thread-concurrency"),
+      MARIADB_REMOVED_OPTION("timed-mutexes"),
+
+      /* The following options were added after 5.6.10 */
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("rpl-stop-slave-timeout"),
+      MYSQL_TO_BE_IMPLEMENTED_OPTION("validate-user-plugins"), // NO_EMBEDDED_ACCESS_CHECKS
       {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
     };
     /*
@@ -6273,24 +6317,6 @@ int handle_early_options()
   return ho_error;
 }
 
-
-#define MYSQL_COMPATIBILITY_OPTION(option) \
-  { option, OPT_MYSQL_COMPATIBILITY, \
-   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
-
-#define MYSQL_TO_BE_IMPLEMENTED_OPTION(option) \
-  { option, OPT_MYSQL_TO_BE_IMPLEMENTED, \
-   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
-
-#define MYSQL_SUGGEST_ANALOG_OPTION(option, str) \
-  { option, OPT_MYSQL_COMPATIBILITY, \
-   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
-
-#define MARIADB_REMOVED_OPTION(option) \
-  { option, OPT_REMOVED_OPTION, \
-   0, 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 }
-
-
 /**
   System variables are automatically command-line options (few
   exceptions are documented in sys_var.h), so don't need
@@ -6740,42 +6766,6 @@ struct my_option my_long_options[]=
    "start.", &wsrep_new_cluster, &wsrep_new_cluster, 0, GET_BOOL, NO_ARG,
    0, 0, 0, 0, 0, 0},
 #endif
-
-  /* The following options exist in 5.6 but not in 10.0 */
-  MYSQL_COMPATIBILITY_OPTION("log-raw"),
-  MYSQL_COMPATIBILITY_OPTION("log-bin-use-v1-row-events"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("default-authentication-plugin"),
-  MYSQL_COMPATIBILITY_OPTION("binlog-max-flush-queue-time"),
-  MYSQL_COMPATIBILITY_OPTION("master-info-repository"),
-  MYSQL_COMPATIBILITY_OPTION("relay-log-info-repository"),
-  MYSQL_SUGGEST_ANALOG_OPTION("binlog-rows-query-log-events", "--binlog-annotate-row-events"),
-  MYSQL_COMPATIBILITY_OPTION("binlog-order-commits"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("log-throttle-queries-not-using-indexes"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("end-markers-in-json"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-features"),     // OPTIMIZER_TRACE
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-offset"),       // OPTIMIZER_TRACE
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("optimizer-trace-limit"),        // OPTIMIZER_TRACE
-  MYSQL_COMPATIBILITY_OPTION("server-id-bits"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("slave-rows-search-algorithms"), // HAVE_REPLICATION
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("slave-allow-batching"),         // HAVE_REPLICATION
-  MYSQL_COMPATIBILITY_OPTION("slave-checkpoint-period"),      // HAVE_REPLICATION
-  MYSQL_COMPATIBILITY_OPTION("slave-checkpoint-group"),       // HAVE_REPLICATION
-  MYSQL_SUGGEST_ANALOG_OPTION("slave-pending-jobs-size-max", "--slave-parallel-max-queued"),  // HAVE_REPLICATION
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("sha256-password-private-key-path"), // HAVE_OPENSSL
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("sha256-password-public-key-path"),  // HAVE_OPENSSL
-
-  /* The following options exist in 5.5 and 5.6 but not in 10.0 */
-  MYSQL_SUGGEST_ANALOG_OPTION("abort-slave-event-count", "--debug-abort-slave-event-count"),
-  MYSQL_SUGGEST_ANALOG_OPTION("disconnect-slave-event-count", "--debug-disconnect-slave-event-count"),
-  MYSQL_SUGGEST_ANALOG_OPTION("exit-info", "--debug-exit-info"),
-  MYSQL_SUGGEST_ANALOG_OPTION("max-binlog-dump-events", "--debug-max-binlog-dump-events"),
-  MYSQL_SUGGEST_ANALOG_OPTION("sporadic-binlog-dump-fail", "--debug-sporadic-binlog-dump-fail"),
-  MYSQL_COMPATIBILITY_OPTION("new"),
-  MYSQL_COMPATIBILITY_OPTION("show_compatibility_56"),
-
-  /* The following options were added after 5.6.10 */
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("rpl-stop-slave-timeout"),
-  MYSQL_TO_BE_IMPLEMENTED_OPTION("validate-user-plugins") // NO_EMBEDDED_ACCESS_CHECKS
 };
 
 static int show_queries(THD *thd, SHOW_VAR *var, char *buff,
@@ -7912,12 +7902,9 @@ mysqld_get_one_option(const struct my_option *opt, char *argument,
     sql_print_warning("'%s' is disabled in this build", opt->name);
 #endif
     break;
-  case OPT_DEPRECATED_OPTION:
-    sql_print_warning("'%s' is deprecated. It does nothing and exists only "
-                      "for compatibility with old my.cnf files.",
-                      opt->name);
-    break;
   case OPT_REMOVED_OPTION:
+    sql_print_warning("'%s' was removed. It does nothing now and exists only "
+                      "for compatibility with old my.cnf files.", opt->name);
     break;
   case OPT_MYSQL_COMPATIBILITY:
     sql_print_warning("'%s' is MySQL 5.6 / 5.7 compatible option. Not used or "
diff --git a/sql/mysqld.h b/sql/mysqld.h
index c6e1b0946a5..db8d9b4b1aa 100644
--- a/sql/mysqld.h
+++ b/sql/mysqld.h
@@ -781,7 +781,6 @@ enum options_mysqld
   OPT_BOOTSTRAP,
   OPT_CONSOLE,
   OPT_DEBUG_SYNC_TIMEOUT,
-  OPT_DEPRECATED_OPTION,
   OPT_REMOVED_OPTION,
   OPT_IGNORE_DB_DIRECTORY,
   OPT_ISAM_LOG,