MDEV-18650: Options deprecated in previous versions - skip-bdb

Remove the option from mysqld --help text.

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

@@ -1120,8 +1120,6 @@ The following specify which files/extra groups are read (specified before remain
  Show user and password in SHOW SLAVE HOSTS on this
  master.
  --silent-startup    Don't print [Note] to the error log during startup.
- --skip-bdb          Deprecated option; Exist only for compatibility with old
- my.cnf files
  --skip-grant-tables Start without grant tables. This gives all users FULL
  ACCESS to all tables.
  --skip-host-cache   Don't cache host names.

sql/mysqld.cc

@@ -5050,6 +5050,8 @@ 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. */
+      {"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, "",
@@ -6738,9 +6740,6 @@ struct my_option my_long_options[]=
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"silent-startup", OPT_SILENT, "Don't print [Note] to the error log during startup.",
    &opt_silent_startup, &opt_silent_startup, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"skip-bdb", OPT_DEPRECATED_OPTION,
-   "Deprecated option; Exist only for compatibility with old my.cnf files",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef DISABLE_GRANT_OPTIONS
   {"skip-grant-tables", 0,
    "Start without grant tables. This gives all users FULL ACCESS to all tables.",

sql/upgrade_conf_file.cc

@@ -117,6 +117,7 @@ static const char *removed_variables[] =
 "log_slow_queries",
 "max_long_data_size",
 "rpl_recovery_rank",
+"skip_bdb",
 "sql_big_tables",
 "sql_low_priority_updates",
 "sql_max_join_size",