← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 19:10:56 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608191056-ycp5b4rgb2hv1ufx
First pass at removing strconvert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
913
913
void
914
914
innobase_convert_from_table_id(
915
915
/*===========================*/
916
 
        struct charset_info_st* cs,     /* in: the 'from' character set */
 
916
        struct charset_info_st* ,       /* in: the 'from' character set */
917
917
        char*                   to,     /* out: converted identifier */
918
918
        const char*             from,   /* in: identifier to convert */
919
919
        ulint                   len)    /* in: length of 'to', in bytes */
920
920
{
921
 
        uint    errors;
922
 
 
923
 
        strconvert(cs, from, &my_charset_filename, to, (uint) len, &errors);
 
921
        strncpy(to, from, len);
924
922
}
925
923
 
926
924
/**********************************************************************
929
927
void
930
928
innobase_convert_from_id(
931
929
/*=====================*/
932
 
        struct charset_info_st* cs,     /* in: the 'from' character set */
 
930
        struct charset_info_st* ,       /* in: the 'from' character set */
933
931
        char*                   to,     /* out: converted identifier */
934
932
        const char*             from,   /* in: identifier to convert */
935
933
        ulint                   len)    /* in: length of 'to', in bytes */
936
934
{
937
 
        uint    errors;
938
 
 
939
 
        strconvert(cs, from, system_charset_info, to, (uint) len, &errors);
 
935
        strncpy(to, from, len);
940
936
}
941
937
 
942
938
/**********************************************************************