← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.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:
drizzled/sql_lex.cc
356
356
  {
357
357
    c= lip->yyGet();
358
358
    lip->tok_bitmap|= c;
359
 
#ifdef USE_MB
360
359
    {
361
360
      if (use_mb(cs))
362
361
      {
368
367
        }
369
368
      }
370
369
    }
371
 
#endif
372
370
    if (c == '\\')
373
371
    {                                   // Escaped character
374
372
      found_escape= true;
415
413
 
416
414
        for (to= start; str != end; str++)
417
415
        {
418
 
#ifdef USE_MB
419
416
          if (use_mb(cs))
420
417
          {
421
418
            int l= my_ismbchar(cs, str, end);
427
424
              continue;
428
425
            }
429
426
          }
430
 
#endif
431
427
          if (*str == '\\' && (str + 1) != end)
432
428
          {
433
429
            switch (*++str) {
712
708
      }
713
709
    case MY_LEX_IDENT:
714
710
      const char *start;
715
 
#if defined(USE_MB) && defined(USE_MB_IDENT)
716
711
      if (use_mb(cs))
717
712
      {
718
713
        result_state= IDENT_QUOTED;
739
734
        }
740
735
      }
741
736
      else
742
 
#endif
743
737
      {
744
738
        for (result_state= c; ident_map[c= lip->yyGet()]; result_state|= c) {};
745
739
        /* If there were non-ASCII characters, mark that we must convert */
842
836
      // fall through
843
837
    case MY_LEX_IDENT_START:                    // We come here after '.'
844
838
      result_state= IDENT;
845
 
#if defined(USE_MB) && defined(USE_MB_IDENT)
846
839
      if (use_mb(cs))
847
840
      {
848
841
        result_state= IDENT_QUOTED;
858
851
        }
859
852
      }
860
853
      else
861
 
#endif
862
854
      {
863
855
        for (result_state=0; ident_map[c= lip->yyGet()]; result_state|= c) {};
864
856
        /* If there were non-ASCII characters, mark that we must convert */
893
885
            continue;
894
886
          }
895
887
        }
896
 
#ifdef USE_MB
897
888
        else if (var_length < 1)
898
889
          break;                                // Error
899
890
        lip->skip_binary(var_length-1);
900
 
#endif
901
891
      }
902
892
      if (double_quotes)
903
893
              yylval->lex_str=get_quoted_token(lip, 1, lip->yyLength() - double_quotes -1, quote_char);