diff options
| author | Magne Mahre <magne.mahre@sun.com> | 2010-02-02 16:34:32 +0100 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@sun.com> | 2010-02-02 16:34:32 +0100 |
| commit | 090c75d2b0e202ca103215fbf1211d7a85defae5 (patch) | |
| tree | 5d50d1b482adbd158560b9684f1ebcb9bda2e006 /sql/mysqld.cc | |
| parent | 59f1be1b636e360c410c81de1c41a8c4a254077d (diff) | |
| download | mariadb-git-090c75d2b0e202ca103215fbf1211d7a85defae5.tar.gz | |
Cleanup fix for WL#5154 that splits commands handling for
--default-character-set and --character-set-server such
that only the first will give a deprecation warning.
Apart from that, the two options should do the same.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 40026867aaf..ca20299b36e 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5733,7 +5733,8 @@ enum options_mysqld OPT_GENERAL_LOG_FILE, OPT_SLOW_QUERY_LOG_FILE, OPT_IGNORE_BUILTIN_INNODB, - OPT_BINLOG_DIRECT_NON_TRANS_UPDATE + OPT_BINLOG_DIRECT_NON_TRANS_UPDATE, + OPT_DEFAULT_CHARACTER_SET_OLD }; @@ -5859,7 +5860,8 @@ struct my_option my_long_options[] = {"debug", '#', "Debug log.", (uchar**) &default_dbug_option, (uchar**) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, #endif - {"default-character-set", 'C', "Set the default character set (deprecated option, use --character-set-server instead).", + {"default-character-set", OPT_DEFAULT_CHARACTER_SET_OLD, + "Set the default character set (deprecated option, use --character-set-server instead).", (uchar**) &default_character_set_name, (uchar**) &default_character_set_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, {"default-collation", OPT_DEFAULT_COLLATION_OLD, "Set the default collation (deprecated option, use --collation-server instead).", @@ -7921,8 +7923,12 @@ mysqld_get_one_option(int optid, case 'b': strmake(mysql_home,argument,sizeof(mysql_home)-1); break; + case OPT_DEFAULT_CHARACTER_SET_OLD: // --default-character-set + WARN_DEPRECATED(NULL, VER_CELOSIA, + "--default-character-set", + "--character-set-server"); + /* Fall through */ case 'C': - WARN_DEPRECATED(NULL, VER_CELOSIA, "--default-character-set", "--character-set-server"); if (default_collation_name == compiled_default_collation_name) default_collation_name= 0; break; |