← Back to branch summary

~brianaker/drizzle/lion-fix

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Mark Atwood
  • Date: 2011-10-27 05:08:12 UTC
  • mfrom: (2445.1.11 rf)
  • Revision ID: me@mark.atwood.name-20111027050812-1icvs72lb0u4xdc4
merge lp:~olafvdspek/drizzle/refactor8

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1233
1233
              Lex.field()->set_name($1.data());
1234
1234
            }
1235
1235
 
1236
 
            if (add_field_to_list(Lex.session, &$1, (enum enum_field_types) $3,
 
1236
            if (add_field_to_list(Lex.session, $1, (enum_field_types) $3,
1237
1237
                                  Lex.length, Lex.dec, Lex.type,
1238
1238
                                  statement->column_format,
1239
1239
                                  statement->default_value, statement->on_update_value,
1936
1936
          {
1937
1937
            statement::AlterTable *statement= (statement::AlterTable *)Lex.statement;
1938
1938
 
1939
 
            if (add_field_to_list(Lex.session,&$3,
 
1939
            if (add_field_to_list(Lex.session, $3,
1940
1940
                                  (enum enum_field_types) $5,
1941
1941
                                  Lex.length, Lex.dec, Lex.type,
1942
1942
                                  statement->column_format,
5435
5435
              {
5436
5436
                Lex.option_type= $1;
5437
5437
              }
5438
 
              Lex.var_list.push_back(SetVarPtr(new set_var(Lex.option_type, $2.var, &$2.base_name, $4)));
 
5438
              Lex.var_list.push_back(SetVarPtr(new set_var(Lex.option_type, $2.var, $2.base_name, $4)));
5439
5439
            }
5440
5440
          }
5441
5441
        | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
5442
5442
          {
5443
5443
            Lex.option_type= $1;
5444
 
            Lex.var_list.push_back(SetVarPtr(new set_var(Lex.option_type,
5445
 
                                              find_sys_var("tx_isolation"),
5446
 
                                              &(null_lex_string()),
5447
 
                                              new Item_int((int32_t)
5448
 
                                              $5))));
 
5444
            Lex.var_list.push_back(SetVarPtr(new set_var(Lex.option_type, find_sys_var("tx_isolation"), str_ref(), new Item_int((int32_t) $5))));
5449
5445
          }
5450
5446
        ;
5451
5447
 
5456
5452
          }
5457
5453
        | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
5458
5454
          {
5459
 
            Lex.var_list.push_back(SetVarPtr(new set_var($3, $4.var, &$4.base_name, $6)));
 
5455
            Lex.var_list.push_back(SetVarPtr(new set_var($3, $4.var, $4.base_name, $6)));
5460
5456
          }
5461
5457
        ;
5462
5458