← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/strfunc.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/strfunc.cc
43
43
  const char* end= find + length;
44
44
  const char* i;
45
45
  const char* j;
46
 
  for (uint32_t pos= 0 ; (j= type_names[pos++]) ; )
 
46
  for (uint32_t pos= 0 ; (j= type_names[pos++]); )
47
47
  {
48
 
    for (i= find ; i != end && my_toupper(system_charset_info, *i) == my_toupper(system_charset_info, *j); i++, j++) 
 
48
    for (i= find ; i != end && system_charset_info->toupper(*i) == system_charset_info->toupper(*j); i++, j++) 
49
49
    {
50
50
    }
51
51
    if (i == end)