diff options
| author | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2004-12-31 15:26:24 +0100 |
| commit | a04fc26c5429284ddae3b5aa19220b057d84b302 (patch) | |
| tree | 928b06c231edee4cb95ace87ed30e879e3dcb0fb /sql/unireg.cc | |
| parent | 849d1203ffb0a68ccec2e9e6e1baba00b2fbe536 (diff) | |
| parent | 45ce994e5dc31c6eb802c3b8eb8955c320a4c111 (diff) | |
| download | mariadb-git-a04fc26c5429284ddae3b5aa19220b057d84b302.tar.gz | |
manually merged
Diffstat (limited to 'sql/unireg.cc')
| -rw-r--r-- | sql/unireg.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc index a16439530fc..ee036ed113d 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -174,6 +174,17 @@ bool mysql_create_frm(THD *thd, my_string file_name, goto err2; if (my_close(file,MYF(MY_WME))) goto err3; + + { + /* Unescape all UCS2 intervals: were escaped in pack_headers */ + List_iterator<create_field> it(create_fields); + create_field *field; + while ((field=it++)) + { + if (field->interval && field->charset->mbminlen > 1) + unhex_type2(field->interval); + } + } DBUG_RETURN(0); err: |