diff options
Diffstat (limited to 'innobase/dict/dict0load.c')
| -rw-r--r-- | innobase/dict/dict0load.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/innobase/dict/dict0load.c b/innobase/dict/dict0load.c index e9076db08f3..07c4ef3c683 100644 --- a/innobase/dict/dict0load.c +++ b/innobase/dict/dict0load.c @@ -360,6 +360,15 @@ dict_load_columns( field = rec_get_nth_field(rec, 6, &len); prtype = mach_read_from_4(field); + if (dtype_is_non_binary_string_type(mtype, prtype) + && dtype_get_charset_coll(prtype) == 0) { + /* This is a non-binary string type, and the table + was created with < 4.1.2. Use the default charset. */ + + prtype = dtype_form_prtype(prtype, + data_mysql_default_charset_coll); + } + field = rec_get_nth_field(rec, 7, &len); col_len = mach_read_from_4(field); |