diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 18:22:21 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-05-22 18:22:21 +0500 |
| commit | bf71feca00efb199f7e055f5ec30b0fca5b2a642 (patch) | |
| tree | 6fa4d21dc5da501d9159ee7074315a73b3363cd4 /sql/mysqld.cc | |
| parent | 9b92f5858adcc25f696d8d06cab90288c16641ac (diff) | |
| download | mariadb-git-bf71feca00efb199f7e055f5ec30b0fca5b2a642.tar.gz | |
mysqld.cc:
default_collation is now displayed correctly in mysqld --help
mysqld --help now displays default_collation corretly, according to --default-character-set
sql/mysqld.cc:
default_collation is now displayed correctly in mysqld --help
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6603e4c306a..6831b4802d9 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4533,6 +4533,12 @@ static void use_help(void) static void usage(void) { + if (!(default_charset_info= get_charset_by_csname(sys_charset.value, + MY_CS_PRIMARY, + MYF(MY_WME)))) + exit(1); + if (!default_collation_name) + default_collation_name= (char*) default_charset_info->name; print_version(); puts("\ Copyright (C) 2000 MySQL AB, by Monty and others\n\ |