diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-06-07 18:33:17 +0500 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2004-06-07 18:33:17 +0500 |
| commit | 777836167af5727624385496922d272b50bc19e0 (patch) | |
| tree | 6941d79a9087adc485dad120744d04dee00f78b5 /sql/mysqld.cc | |
| parent | 18430e225e609ad91b55a04a2c69d3e9dfebc40c (diff) | |
| download | mariadb-git-777836167af5727624385496922d272b50bc19e0.tar.gz | |
mysqld.cc:
WL#1160.
Adding variable-conformant startup options for --default-character-set and --default-collation
sql/mysqld.cc:
WL#1160.
Adding variable-conformant startup options for --default-character-set and --default-collation
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 083979ba5d6..5c16fe2e575 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3959,6 +3959,12 @@ Disable with --skip-bdb (will save memory).", REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, + {"character_set_server", 'C', "Set the default character set.", + (gptr*) &default_character_set_name, (gptr*) &default_character_set_name, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, + {"collation_server", OPT_DEFAULT_COLLATION, "Set the default collation.", + (gptr*) &default_collation_name, (gptr*) &default_collation_name, + 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, {"console", OPT_CONSOLE, "Write error output on screen; Don't remove the console window on windows.", (gptr*) &opt_console, (gptr*) &opt_console, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, @@ -3992,10 +3998,10 @@ Disable with --skip-bdb (will save memory).", (gptr*) &des_key_file, (gptr*) &des_key_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #endif /* HAVE_OPENSSL */ - {"default-character-set", 'C', "Set the default character set.", + {"default-character-set", 'C', "Set the default character set (Deprecated option, use character_set_server instead).", (gptr*) &default_character_set_name, (gptr*) &default_character_set_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, - {"default-collation", OPT_DEFAULT_COLLATION, "Set the default collation.", + {"default-collation", OPT_DEFAULT_COLLATION, "Set the default collation (Deprecated option, use character_set_server instead).", (gptr*) &default_collation_name, (gptr*) &default_collation_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, {"default-storage-engine", OPT_STORAGE_ENGINE, |