diff options
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: |