← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Much closer toward UTF8 being around all the time...

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
2043
2043
 
2044
2044
opt_binary:
2045
2045
          /* empty */ { Lex->charset=NULL; }
2046
 
        | ASCII_SYM opt_bin_mod { Lex->charset=&my_charset_latin1; }
 
2046
        | ASCII_SYM opt_bin_mod { Lex->charset=&my_charset_utf8_general_ci; }
2047
2047
        | BYTE_SYM { Lex->charset=&my_charset_bin; }
2048
2048
        | UNICODE_SYM opt_bin_mod
2049
2049
          {
2065
2065
 
2066
2066
opt_bin_charset:
2067
2067
          /* empty */ { Lex->charset= NULL; }
2068
 
        | ASCII_SYM { Lex->charset=&my_charset_latin1; }
 
2068
        | ASCII_SYM { Lex->charset=&my_charset_utf8_general_ci; }
2069
2069
        | UNICODE_SYM
2070
2070
          {
2071
2071
            if (!(Lex->charset=get_charset_by_csname("ucs2",
3855
3855
opt_gconcat_separator:
3856
3856
          /* empty */
3857
3857
            {
3858
 
              $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
 
3858
              $$= new (YYTHD->mem_root) String(",", 1, &my_charset_utf8_general_ci);
3859
3859
            }
3860
3860
        | SEPARATOR_SYM text_string { $$ = $2; }
3861
3861
        ;
4567
4567
        | /* empty */
4568
4568
          {
4569
4569
            Lex->escape_used= false;
4570
 
            $$= new Item_string("\\", 1, &my_charset_latin1);
 
4570
            $$= new Item_string("\\", 1, &my_charset_utf8_general_ci);
4571
4571
          }
4572
4572
        ;
4573
4573