diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-02-21 18:24:41 +0400 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-02-21 18:24:41 +0400 |
| commit | 0bf753ab745b229e68efeaf999aa072d73194f41 (patch) | |
| tree | 3119b5cf68fdf8b0d4ebc71748ba34587cf9041c /sql/sql_table.cc | |
| parent | f14222f2523db13becf570185296ed7c08b9d1b2 (diff) | |
| download | mariadb-git-0bf753ab745b229e68efeaf999aa072d73194f41.tar.gz | |
DATABASE character set is never blank anymore
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index c6fa4d25120..80ddad3a4d2 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -461,9 +461,7 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name, { if (!sql_field->charset) sql_field->charset = create_info->table_charset ? - create_info->table_charset : - thd->db_charset? thd->db_charset : - default_charset_info; + create_info->table_charset : thd->db_charset; switch (sql_field->sql_type) { case FIELD_TYPE_BLOB: |