← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Monty Taylor
  • Date: 2009-12-27 00:49:03 UTC
  • mto: This revision was merged to the branch mainline in revision 1255.
  • Revision ID: mordred@inaugust.com-20091227004903-maw7ktxu6i6hye9b
Moved mem_root functions into drizzled::memory:: namespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
1421
1421
          field_spec opt_check_constraint
1422
1422
        | field_spec references
1423
1423
          {
1424
 
            Lex->col_list.empty(); /* Alloced by sql_alloc */
 
1424
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1425
1425
          }
1426
1426
        ;
1427
1427
 
1433
1433
            Key *key= new Key($1, $2, &statement->key_create_info, 0,
1434
1434
                              lex->col_list);
1435
1435
            statement->alter_info.key_list.push_back(key);
1436
 
            lex->col_list.empty(); /* Alloced by sql_alloc */
 
1436
            lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1437
1437
          }
1438
1438
        | opt_constraint constraint_key_type opt_ident key_alg
1439
1439
          '(' key_list ')' key_options
1443
1443
            Key *key= new Key($2, $3.str ? $3 : $1, &statement->key_create_info, 0,
1444
1444
                              lex->col_list);
1445
1445
            statement->alter_info.key_list.push_back(key);
1446
 
            lex->col_list.empty(); /* Alloced by sql_alloc */
 
1446
            lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1447
1447
          }
1448
1448
        | opt_constraint FOREIGN KEY_SYM opt_ident '(' key_list ')' references
1449
1449
          {
1460
1460
                         &default_key_create_info, 1,
1461
1461
                         lex->col_list);
1462
1462
            statement->alter_info.key_list.push_back(key);
1463
 
            lex->col_list.empty(); /* Alloced by sql_alloc */
 
1463
            lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1464
1464
            /* Only used for ALTER TABLE. Ignored otherwise. */
1465
1465
            statement->alter_info.flags.set(ALTER_FOREIGN_KEY);
1466
1466
          }
1467
1467
        | constraint opt_check_constraint
1468
1468
          {
1469
 
            Lex->col_list.empty(); /* Alloced by sql_alloc */
 
1469
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1470
1470
          }
1471
1471
        | opt_constraint check_constraint
1472
1472
          {
1473
 
            Lex->col_list.empty(); /* Alloced by sql_alloc */
 
1473
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
1474
1474
          }
1475
1475
        ;
1476
1476
 
3519
3519
          {
3520
3520
            Select_Lex *select= Lex->current_select;
3521
3521
            select->gorder_list=
3522
 
              (SQL_LIST*) sql_memdup((char*) &select->order_list,
 
3522
              (SQL_LIST*) memory::sql_memdup((char*) &select->order_list,
3523
3523
                                     sizeof(st_sql_list));
3524
3524
            select->order_list.empty();
3525
3525
          }
4143
4143
opt_table_alias:
4144
4144
          /* empty */ { $$=0; }
4145
4145
        | table_alias ident
4146
 
          { $$= (LEX_STRING*) sql_memdup(&$2,sizeof(LEX_STRING)); }
 
4146
          { $$= (LEX_STRING*) memory::sql_memdup(&$2,sizeof(LEX_STRING)); }
4147
4147
        ;
4148
4148
 
4149
4149
opt_all: