Commit 889ce031 authored by Norvald H. Ryeng's avatar Norvald H. Ryeng

WL#6311 Remove --safe-mode

Print deprecation warning if the --safe-mode command line option is
used.
parent be7a6d93
...@@ -595,7 +595,7 @@ The following options may be given as the first argument: ...@@ -595,7 +595,7 @@ The following options may be given as the first argument:
master during slave registration master during slave registration
--rpl-recovery-rank=# --rpl-recovery-rank=#
Unused, will be removed Unused, will be removed
--safe-mode Skip some optimize stages (for testing). --safe-mode Skip some optimize stages (for testing). Deprecated.
--safe-user-create Don't allow new user creation by the user who has no --safe-user-create Don't allow new user creation by the user who has no
write privileges to the mysql.user table. write privileges to the mysql.user table.
--secure-auth Disallow authentication for accounts that have old --secure-auth Disallow authentication for accounts that have old
......
...@@ -595,7 +595,7 @@ The following options may be given as the first argument: ...@@ -595,7 +595,7 @@ The following options may be given as the first argument:
master during slave registration master during slave registration
--rpl-recovery-rank=# --rpl-recovery-rank=#
Unused, will be removed Unused, will be removed
--safe-mode Skip some optimize stages (for testing). --safe-mode Skip some optimize stages (for testing). Deprecated.
--safe-user-create Don't allow new user creation by the user who has no --safe-user-create Don't allow new user creation by the user who has no
write privileges to the mysql.user table. write privileges to the mysql.user table.
--secure-auth Disallow authentication for accounts that have old --secure-auth Disallow authentication for accounts that have old
......
...@@ -5948,7 +5948,7 @@ struct my_option my_long_options[]= ...@@ -5948,7 +5948,7 @@ struct my_option my_long_options[]=
"will not do updates to tables in databases that start with foo and whose " "will not do updates to tables in databases that start with foo and whose "
"table names start with bar.", "table names start with bar.",
0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing).", {"safe-mode", OPT_SAFE, "Skip some optimize stages (for testing). Deprecated.",
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"safe-user-create", 0, {"safe-user-create", 0,
"Don't allow new user creation by the user who has no write privileges to the mysql.user table.", "Don't allow new user creation by the user who has no write privileges to the mysql.user table.",
...@@ -7081,6 +7081,8 @@ mysqld_get_one_option(int optid, ...@@ -7081,6 +7081,8 @@ mysqld_get_one_option(int optid,
delay_key_write_options= DELAY_KEY_WRITE_NONE; delay_key_write_options= DELAY_KEY_WRITE_NONE;
myisam_recover_options= HA_RECOVER_DEFAULT; myisam_recover_options= HA_RECOVER_DEFAULT;
ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE); ha_open_options&= ~(HA_OPEN_DELAY_KEY_WRITE);
sql_print_warning("The syntax '--safe-mode' is deprecated and will be "
"removed in a future release.");
break; break;
case (int) OPT_SKIP_PRIOR: case (int) OPT_SKIP_PRIOR:
opt_specialflag|= SPECIAL_NO_PRIOR; opt_specialflag|= SPECIAL_NO_PRIOR;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment