← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1013
1013
          }
1014
1014
        | DEFINER TEXT_STRING_sys
1015
1015
          {
1016
 
            parser::buildSchemaDefiner(&Lex, $2);
 
1016
            parser::buildSchemaDefiner(&Lex, identifier::User($2));
1017
1017
          }
1018
1018
        | DEFINER CURRENT_USER optional_braces
1019
1019
          {
1080
1080
          }
1081
1081
        | DEFINER TEXT_STRING_sys
1082
1082
          {
1083
 
            drizzled::identifier::User user($2.data());
1084
 
            message::set_definer(*Lex.table(), user);
 
1083
            message::set_definer(*Lex.table(), identifier::User($2));
1085
1084
          }
1086
1085
        | DEFINER CURRENT_USER optional_braces
1087
1086
          {
2691
2690
        | function_call_conflict
2692
2691
        | simple_expr COLLATE_SYM ident_or_text %prec UMINUS
2693
2692
          {
2694
 
            Item *i1= new (YYSession->mem_root) Item_string($3.data(), $3.size(), YYSession->charset());
 
2693
            Item *i1= new (YYSession->mem_root) Item_string($3, YYSession->charset());
2695
2694
            $$= new (YYSession->mem_root) Item_func_set_collation($1, i1);
2696
2695
          }
2697
2696
        | literal
3942
3941
        | /* empty */
3943
3942
          {
3944
3943
            Lex.escape_used= false;
3945
 
            $$= new Item_string("\\", 1, &my_charset_utf8_general_ci);
 
3944
            $$= new Item_string(str_ref("\\"), &my_charset_utf8_general_ci);
3946
3945
          }
3947
3946
        ;
3948
3947
 
5153
5152
          {
5154
5153
            const charset_info_st * const cs= system_charset_info;
5155
5154
            int dummy_error;
5156
 
            uint32_t wlen= cs->cset->well_formed_len(cs, $1.begin(), $1.end(), $1.size(), &dummy_error);
 
5155
            uint32_t wlen= cs->cset->well_formed_len(*cs, $1, $1.size(), &dummy_error);
5157
5156
            if (wlen < $1.size())
5158
5157
            {
5159
5158
              my_error(ER_INVALID_CHARACTER_STRING, MYF(0), cs->csname, $1.data() + wlen);
5482
5481
            {
5483
5482
              /* Not an SP local variable */
5484
5483
              sys_var *tmp= find_sys_var(to_string($1));
5485
 
              if (!tmp)
 
5484
              if (not tmp)
5486
5485
                DRIZZLE_YYABORT;
5487
5486
              $$.var= tmp;
5488
5487
              $$.base_name= null_lex_string();
5500
5499
set_expr_or_default:
5501
5500
          expr { $$=$1; }
5502
5501
        | DEFAULT { $$=0; }
5503
 
        | ON     { $$=new Item_string("ON",  2, system_charset_info); }
5504
 
        | ALL    { $$=new Item_string("ALL", 3, system_charset_info); }
5505
 
        | BINARY { $$=new Item_string("binary", 6, system_charset_info); }
 
5502
        | ON     { $$=new Item_string(str_ref("ON"), system_charset_info); }
 
5503
        | ALL    { $$=new Item_string(str_ref("ALL"), system_charset_info); }
 
5504
        | BINARY { $$=new Item_string(str_ref("binary"), system_charset_info); }
5506
5505
        ;
5507
5506
 
5508
5507
table_or_tables: