diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b254e76d14d..8ee4b0408ef 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -44,6 +44,7 @@ #include "sql_base.h" #include "sql_test.h" // mysql_print_status #include "item_create.h" // item_create_cleanup, item_create_init +#include "json_schema.h" #include "sql_servers.h" // servers_free, servers_init #include "init.h" // unireg_init #include "derror.h" // init_errmessage @@ -1992,6 +1993,7 @@ static void clean_up(bool print_message) item_func_sleep_free(); lex_free(); /* Free some memory */ item_create_cleanup(); + cleanup_json_schema_keyword_hash(); tdc_start_shutdown(); #ifdef HAVE_REPLICATION semi_sync_master_deinit(); @@ -4265,6 +4267,7 @@ static int init_common_variables() if (item_create_init()) return 1; item_init(); + setup_json_schema_keyword_hash(); /* Process a comma-separated character set list and choose the first available character set. This is mostly for @@ -5306,6 +5309,12 @@ static int init_server_components() #if defined(__linux__) MARIADB_REMOVED_OPTION("super-large-pages"), #endif + MARIADB_REMOVED_OPTION("innodb-defragment"), + MARIADB_REMOVED_OPTION("innodb-defragment-n-pages"), + MARIADB_REMOVED_OPTION("innodb-defragment-stats-accuracy"), + MARIADB_REMOVED_OPTION("innodb-defragment-fill-factor"), + MARIADB_REMOVED_OPTION("innodb-defragment-fill-factor-n-recs"), + MARIADB_REMOVED_OPTION("innodb-defragment-frequency"), MARIADB_REMOVED_OPTION("innodb-idle-flush-pct"), MARIADB_REMOVED_OPTION("innodb-locks-unsafe-for-binlog"), MARIADB_REMOVED_OPTION("innodb-rollback-segments"), |