← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.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/show.cc
63
63
      if (*wildstr == internal::wild_prefix && wildstr[1])
64
64
        wildstr++;
65
65
 
66
 
      if (my_toupper(cs, *wildstr++) != my_toupper(cs, *str++))
 
66
      if (cs->toupper(*wildstr++) != cs->toupper(*str++))
67
67
        return (1);
68
68
    }
69
69
 
89
89
          if ((cmp= *wildstr) == internal::wild_prefix && wildstr[1])
90
90
            cmp= wildstr[1];
91
91
 
92
 
          cmp= my_toupper(cs, cmp);
 
92
          cmp= cs->toupper(cmp);
93
93
 
94
 
          while (*str && my_toupper(cs, *str) != cmp)
 
94
          while (*str && cs->toupper(*str) != cmp)
95
95
            str++;
96
96
 
97
97
          if (! *str)