~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2011-02-18 16:15:33 UTC
  • mfrom: (2179.2.1 list-clear)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: brian@tangent.org-20110218161533-mkgbhtbpfj8mb12x
Merge in clear() by Olaf

Show diffs side-by-side

added added

removed removed

Lines of Context:
841
841
                                                     TL_OPTION_UPDATING,
842
842
                                                     TL_WRITE))
843
843
              DRIZZLE_YYABORT;
844
 
            Lex->col_list.empty();
 
844
            Lex->col_list.clear();
845
845
          }
846
846
          create_table_definition
847
847
          {
1111
1111
          field_spec opt_check_constraint
1112
1112
        | field_spec references
1113
1113
          {
1114
 
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
 
1114
            Lex->col_list.clear(); /* Alloced by memory::sql_alloc */
1115
1115
          }
1116
1116
        ;
1117
1117
 
1131
1131
          }
1132
1132
        | constraint opt_check_constraint
1133
1133
          {
1134
 
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
 
1134
            Lex->col_list.clear(); /* Alloced by memory::sql_alloc */
1135
1135
          }
1136
1136
        | opt_constraint check_constraint
1137
1137
          {
1138
 
            Lex->col_list.empty(); /* Alloced by memory::sql_alloc */
 
1138
            Lex->col_list.clear(); /* Alloced by memory::sql_alloc */
1139
1139
          }
1140
1140
        ;
1141
1141
 
1268
1268
          }
1269
1269
        | ENUM_SYM
1270
1270
          {
1271
 
            Lex->interval_list.empty();
 
1271
            Lex->interval_list.clear();
1272
1272
          }
1273
1273
          '(' string_list ')'
1274
1274
          {
1501
1501
 
1502
1502
opt_ref_list:
1503
1503
          /* empty */
1504
 
          { Lex->ref_list.empty(); }
 
1504
          { Lex->ref_list.clear(); }
1505
1505
        | '(' ref_list ')'
1506
1506
        ;
1507
1507
 
1510
1510
          { Lex->ref_list.push_back(new Key_part_spec($3, 0)); }
1511
1511
        | ident
1512
1512
          {
1513
 
            Lex->ref_list.empty();
 
1513
            Lex->ref_list.clear();
1514
1514
            Lex->ref_list.push_back(new Key_part_spec($1, 0));
1515
1515
          }
1516
1516
        ;
1685
1685
              DRIZZLE_YYABORT;
1686
1686
            }
1687
1687
 
1688
 
            Lex->col_list.empty();
 
1688
            Lex->col_list.clear();
1689
1689
            Lex->select_lex.init_order();
1690
1690
            Lex->select_lex.db= const_cast<char *>(((TableList*) Lex->select_lex.table_list.first)->getSchemaName());
1691
1691
          }
2996
2996
            sel->in_sum_expr--;
2997
2997
            $$=new Item_func_group_concat(Lex->current_context(), $3, $5,
2998
2998
                                          sel->gorder_list, $7);
2999
 
            $5->empty();
 
2999
            $5->clear();
3000
3000
          }
3001
3001
        ;
3002
3002
 
3057
3057
            select->gorder_list=
3058
3058
              (SQL_LIST*) memory::sql_memdup((char*) &select->order_list,
3059
3059
                                     sizeof(st_sql_list));
3060
 
            select->order_list.empty();
 
3060
            select->order_list.clear();
3061
3061
          }
3062
3062
        ;
3063
3063
 
4120
4120
insert_table:
4121
4121
          table_name
4122
4122
          {
4123
 
            Lex->field_list.empty();
4124
 
            Lex->many_values.empty();
 
4123
            Lex->field_list.clear();
 
4124
            Lex->many_values.clear();
4125
4125
            Lex->insert_list=0;
4126
4126
          };
4127
4127
 
4604
4604
                    $12, NULL, TL_OPTION_UPDATING,
4605
4605
                    Lex->lock_option))
4606
4606
              DRIZZLE_YYABORT;
4607
 
            Lex->field_list.empty();
4608
 
            Lex->update_list.empty();
4609
 
            Lex->value_list.empty();
 
4607
            Lex->field_list.clear();
 
4608
            Lex->update_list.clear();
 
4609
            Lex->value_list.clear();
4610
4610
          }
4611
4611
          opt_field_term opt_line_term opt_ignore_lines opt_field_or_var_spec
4612
4612
          opt_load_data_set_spec