diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-07 17:32:23 +0200 |
| commit | 8ee9d19607d84aeebf97b704a19453f6a772299b (patch) | |
| tree | 75e597dde9dc38b7fa3352abec7e88edddce2182 /storage/innobase/dict/dict0dict.cc | |
| parent | 08f3280235efbaf20988b81653fced604de1a90f (diff) | |
| parent | 60aba058b116c1d2fa4106fc8de92daf10152480 (diff) | |
| download | mariadb-git-8ee9d19607d84aeebf97b704a19453f6a772299b.tar.gz | |
innodb 5.6.17
Diffstat (limited to 'storage/innobase/dict/dict0dict.cc')
| -rw-r--r-- | storage/innobase/dict/dict0dict.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index bbae608efdb..a1234b0e914 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -6194,9 +6194,8 @@ dict_fs2utf8( db[db_len] = '\0'; strconvert( - &my_charset_filename, db, db_len, - system_charset_info, db_utf8, db_utf8_size, - &errors); + &my_charset_filename, db, db_len, system_charset_info, + db_utf8, static_cast<uint>(db_utf8_size), &errors); /* convert each # to @0023 in table name and store the result in buf */ const char* table = dict_remove_db_name(db_and_table); @@ -6221,8 +6220,8 @@ dict_fs2utf8( errors = 0; strconvert( - &my_charset_filename, buf, (uint) (buf_p - buf), - system_charset_info, table_utf8, table_utf8_size, + &my_charset_filename, buf, (uint) (buf_p - buf), system_charset_info, + table_utf8, static_cast<uint>(table_utf8_size), &errors); if (errors != 0) { |