From 88e9a0bf2b8e09ab998334c3086644e6d4eb2e38 Mon Sep 17 00:00:00 2001
From: "bar@bar.mysql.r18.ru" <>
Date: Thu, 9 Jan 2003 16:38:23 +0400
Subject: [PATCH] do not call get_charset_by_name() with string "DEFAULT"

---
 sql/sql_db.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index f14fe50b200..1c441ea7a26 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -114,10 +114,12 @@ static bool load_db_opt(const char *path, HA_CREATE_INFO *create)
       {
 	if (!strncmp(buf,"default-character-set", (pos-buf)))
 	{
-	  if (!(create->table_charset=get_charset_by_name(pos+1, MYF(0))))
+	  if (strcmp(pos+1,"DEFAULT"))
 	  {
-	    sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),
-			    pos+1);
+	    if (!(create->table_charset=get_charset_by_name(pos+1, MYF(0))))
+	    {
+	      sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);
+	    }
 	  }
 	}
       }
-- 
2.30.9