← 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: Mark Atwood
  • Date: 2011-11-11 18:23:18 UTC
  • mfrom: (2456.1.5 rf)
  • Revision ID: me@mark.atwood.name-20111111182318-skgcp9ce65fd2goa
merge lp:~olafvdspek/drizzle/refactor11

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
603
603
 
604
604
    const char *ext= strchr(filename->c_str(), '.');
605
605
 
606
 
    if (ext == NULL || my_strcasecmp(system_charset_info, ext, DEFAULT_FILE_EXTENSION) ||
 
606
    if (ext == NULL || system_charset_info->strcasecmp(ext, DEFAULT_FILE_EXTENSION) ||
607
607
        (filename->compare(0, strlen(TMP_FILE_PREFIX), TMP_FILE_PREFIX) == 0))
608
608
    { }
609
609
    else
1324
1324
  const char* a,  /*!< in: first string to compare */
1325
1325
  const char* b)  /*!< in: second string to compare */
1326
1326
{
1327
 
  return(my_strcasecmp(system_charset_info, a, b));
 
1327
  return(system_charset_info->strcasecmp(a, b));
1328
1328
}
1329
1329
 
1330
1330
/******************************************************************//**
1335
1335
/*================*/
1336
1336
  char* a)  /*!< in/out: string to put in lower case */
1337
1337
{
1338
 
  my_casedn_str(system_charset_info, a);
 
1338
  system_charset_info->casedn_str(a);
1339
1339
}
1340
1340
 
1341
1341
UNIV_INTERN