From 0f298f02dbc1ed7b4f9a178d154a7b946cdcffe8 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Fri, 23 Jul 2004 17:11:45 +0500
Subject: [PATCH] sql_db.cc:   mysqld crashes on CREATE TABLE in a database
 with corrupted db.opt file.   Bug#4646

---
 sql/sql_db.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 43a683db9de..ef180b58ee0 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -327,6 +327,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
 	  {
 	    sql_print_error("Error while loading database options: '%s':",path);
 	    sql_print_error(ER(ER_UNKNOWN_CHARACTER_SET),pos+1);
+            create->default_table_charset= default_charset_info;
 	  }
 	}
 	else if (!strncmp(buf,"default-collation", (pos-buf)))
@@ -336,6 +337,7 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
 	  {
 	    sql_print_error("Error while loading database options: '%s':",path);
 	    sql_print_error(ER(ER_UNKNOWN_COLLATION),pos+1);
+            create->default_table_charset= default_charset_info;
 	  }
 	}
       }