From bf71feca00efb199f7e055f5ec30b0fca5b2a642 Mon Sep 17 00:00:00 2001
From: unknown <bar@bar.mysql.r18.ru>
Date: Thu, 22 May 2003 18:22:21 +0500
Subject: [PATCH] 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
---
 sql/mysqld.cc | 6 ++++++
 1 file changed, 6 insertions(+)

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\