← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/strfunc.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/strfunc.cc
41
41
                  const CHARSET_INFO * const cs,
42
42
                  char **err_pos, uint *err_len, bool *set_warning)
43
43
{
44
 
  const CHARSET_INFO * const strip= cs ? cs : &my_charset_latin1;
 
44
  const CHARSET_INFO * const strip= cs ? cs : &my_charset_utf8_general_ci;
45
45
  const char *end= str + strip->cset->lengthsp(strip, str, length);
46
46
  uint64_t found= 0;
47
47
  *err_pos= 0;                  // No error yet
226
226
  const char *ptr;
227
227
 
228
228
  /* Fiend end of word */
229
 
  for (ptr= val ; ptr < end && my_isalpha(&my_charset_latin1, *ptr) ; ptr++)
 
229
  for (ptr= val ; ptr < end && my_isalpha(&my_charset_utf8_general_ci, *ptr) ; ptr++)
230
230
    ;
231
231
  if ((res=find_type(lib, val, (uint) (ptr - val), 1)) > 0)
232
232
    *end_of_word= ptr;