diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a671c4409f30dad0189fc9622142405033b2cde6..d4c469400adbb29458239345173d707a969d6c64 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5828,7 +5828,7 @@ pthread_handler_t handle_connections_shared_memory(void *arg) enum options_mysqld { - OPT_ISAM_LOG=256, OPT_SKIP_NEW, + OPT_ISAM_LOG=256, OPT_SKIP_GRANT, OPT_SKIP_LOCK, OPT_ENABLE_LOCK, OPT_USE_LOCKING, OPT_SOCKET, OPT_UPDATE_LOG, @@ -6799,8 +6799,6 @@ thread is in the relay logs.", {"skip-networking", OPT_SKIP_NETWORKING, "Don't allow connection with TCP/IP.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, - {"skip-new", OPT_SKIP_NEW, "Don't use new, possibly wrong routines.", - 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, #ifndef DBUG_OFF #ifdef SAFEMALLOC {"skip-safemalloc", OPT_SKIP_SAFEMALLOC, @@ -8722,20 +8720,15 @@ mysqld_get_one_option(int optid, return 1; #endif break; - case (int) OPT_SKIP_NEW: - opt_specialflag|= SPECIAL_NO_NEW_FUNC; + case (int) OPT_SAFE: + opt_specialflag|= SPECIAL_SAFE_MODE | SPECIAL_NO_NEW_FUNC; delay_key_write_options= (uint) DELAY_KEY_WRITE_NONE; + myisam_recover_options= HA_RECOVER_DEFAULT; ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE); #ifdef HAVE_QUERY_CACHE query_cache_size=0; #endif break; - case (int) OPT_SAFE: - opt_specialflag|= SPECIAL_SAFE_MODE; - delay_key_write_options= (uint) DELAY_KEY_WRITE_NONE; - myisam_recover_options= HA_RECOVER_DEFAULT; - ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE); - break; case (int) OPT_SKIP_PRIOR: opt_specialflag|= SPECIAL_NO_PRIOR; sql_print_warning("The --skip-thread-priority startup option is deprecated "