diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-01-09 16:38:23 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-01-09 16:38:23 +0400 |
| commit | 5a5c618ee40249cf4f50ce698bb2ec682acd82ab (patch) | |
| tree | b3779bd634c7d1d52d9b5bdb1a6c61e8618706d9 /sql/sql_db.cc | |
| parent | 6383a27b5323c8e033efd608e3f387d013d312ef (diff) | |
| download | mariadb-git-5a5c618ee40249cf4f50ce698bb2ec682acd82ab.tar.gz | |
do not call get_charset_by_name() with string "DEFAULT"
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 8 |
1 files 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); + } } } } |