diff options
author | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2013-05-10 15:35:40 +0530 |
---|---|---|
committer | Annamalai Gurusami <annamalai.gurusami@oracle.com> | 2013-05-10 15:35:40 +0530 |
commit | 91ac1284ebaf55193d78c26519ebdc600ad5cad7 (patch) | |
tree | c003e0e0fe0199cf207c969ee7fabf0a02eac363 /storage | |
parent | 12a26cd6e013a2670a4faf39dd2570106d952809 (diff) | |
download | mariadb-git-91ac1284ebaf55193d78c26519ebdc600ad5cad7.tar.gz |
Fixing a build issue. The function innobase_convert_to_system_charset()
is included only in the builtin InnoDB, and it is missed in InnoDB
plugin. Adding this function in InnoDB plugin as well.
Diffstat (limited to 'storage')
-rw-r--r-- | storage/innodb_plugin/handler/ha_innodb.cc | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc index 9bfa3b51948..38f1fd566b1 100644 --- a/storage/innodb_plugin/handler/ha_innodb.cc +++ b/storage/innodb_plugin/handler/ha_innodb.cc @@ -1052,6 +1052,23 @@ innobase_convert_from_id( strconvert(cs, from, system_charset_info, to, (uint) len, &errors); } +/********************************************************************** +Converts an identifier from my_charset_filename to UTF-8 charset. */ +extern "C" +uint +innobase_convert_to_system_charset( +/*===============================*/ + char* to, /* out: converted identifier */ + const char* from, /* in: identifier to convert */ + ulint len, /* in: length of 'to', in bytes */ + uint* errors) /* out: error return */ +{ + CHARSET_INFO* cs1 = &my_charset_filename; + CHARSET_INFO* cs2 = system_charset_info; + + return(strconvert(cs1, from, cs2, to, len, errors)); +} + /******************************************************************//** Compares NUL-terminated UTF-8 strings case insensitively. @return 0 if a=b, <0 if a<b, >1 if a>b */ |