diff options
| author | unknown <bar@mysql.com> | 2004-07-23 17:11:45 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-07-23 17:11:45 +0500 |
| commit | 9d670dfab57b22e7334c85fbf27d463ea6da004a (patch) | |
| tree | e37cbd5162aa5d117313a8a183fdb85257fde335 /sql | |
| parent | 3cf19c3af593f279e326738b06d9f0a7e561ff92 (diff) | |
| download | mariadb-git-9d670dfab57b22e7334c85fbf27d463ea6da004a.tar.gz | |
sql_db.cc:
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
sql/sql_db.cc:
mysqld crashes on CREATE TABLE in a database with corrupted db.opt file.
Bug#4646
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_db.cc | 2 |
1 files changed, 2 insertions, 0 deletions
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; } } } |