1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WL#6311 Remove --safe-mode

Browse Source 
Print deprecation warning if the --safe-mode command line option is
used.
This commit is contained in:
Norvald H. Ryeng 2012-05-23 12:27:32 +02:00
parent 7d3ae34e75
commit 77fcf72cf4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/mysqld--help-notwin.result
View File

@ -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

2
mysql-test/r/mysqld--help-win.result
View File

@ -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

4
sql/mysqld.cc
View File

@ -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,
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;