← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/charset.cc

  • Committer: Brian Aker
  • Date: 2009-07-16 19:30:03 UTC
  • mfrom: (1093.1.17 captain)
  • Revision ID: brian@gaz-20090716193003-gwt4i1le2g02ay0j
Merge Jay

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/charset.cc
74
74
      state_map[i]=(unsigned char) MY_LEX_IDENT;
75
75
    else if (my_isdigit(cs,i))
76
76
      state_map[i]=(unsigned char) MY_LEX_NUMBER_IDENT;
77
 
#if defined(USE_MB) && defined(USE_MB_IDENT)
78
77
    else if (my_mbcharlen(cs, i)>1)
79
78
      state_map[i]=(unsigned char) MY_LEX_IDENT;
80
 
#endif
81
79
    else if (my_isspace(cs,i))
82
80
      state_map[i]=(unsigned char) MY_LEX_SKIP;
83
81
    else
313
311
  const char *to_start= to;
314
312
  const char *end, *to_end=to_start + (to_length ? to_length-1 : 2*length);
315
313
  bool overflow= false;
316
 
#ifdef USE_MB
317
314
  bool use_mb_flag= use_mb(charset_info);
318
 
#endif
319
315
  for (end= from + length; from < end; from++)
320
316
  {
321
 
#ifdef USE_MB
322
317
    int tmp_length;
323
318
    if (use_mb_flag && (tmp_length= my_ismbchar(charset_info, from, end)))
324
319
    {
337
332
      turned into a multi-byte character by the addition of an escaping
338
333
      character, because we are only escaping the ' character with itself.
339
334
     */
340
 
#endif
341
335
    if (*from == '\'')
342
336
    {
343
337
      if (to + 2 > to_end)