bugfix: mysqld --safe-mode crashes

df6899b3 · Sergei Golubchik · d74fee9e · df6899b3 · df6899b3
Commit df6899b3 authored May 03, 2024 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/suite/parts/t/partition_recover_myisam-master.opt mysql-test/suite/parts/t/partition_recover_myisam-master.opt +1 -1

sql/mysqld.cc sql/mysqld.cc +1 -1

No files found.
--- a/mysql-test/suite/parts/t/partition_recover_myisam-master.opt
+++ b/mysql-test/suite/parts/t/partition_recover_myisam-master.opt
--myisam-recover-options
+--safe-mode
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -8241,7 +8241,7 @@ mysqld_get_one_option(const struct my_option *opt, const char *argument,
  case (int) OPT_SAFE:
    opt_specialflag|= SPECIAL_SAFE_MODE | SPECIAL_NO_NEW_FUNC;
    SYSVAR_AUTOSIZE(delay_key_write_options, (uint) DELAY_KEY_WRITE_NONE);
-    SYSVAR_AUTOSIZE(myisam_recover_options, HA_RECOVER_DEFAULT);
+    myisam_recover_options= HA_RECOVER_DEFAULT;
    ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE);
 #ifdef HAVE_QUERY_CACHE
    SYSVAR_AUTOSIZE(query_cache_size, 0);