← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.cc

  • Committer: Olaf van der Spek
  • Date: 2011-02-18 10:22:24 UTC
  • mto: (2180.1.3 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: olafvdspek@gmail.com-20110218102224-bjqbn4734ylsol0u
Rename List::empty to clear (std::list uses clear)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.cc
227
227
 
228
228
  lex->session= lex->unit.session= session;
229
229
 
230
 
  lex->context_stack.empty();
 
230
  lex->context_stack.clear();
231
231
  lex->unit.init_query();
232
232
  lex->unit.init_select();
233
233
  /* 'parent_lex' is used in init_query() so it must be before it. */
234
234
  lex->select_lex.parent_lex= lex;
235
235
  lex->select_lex.init_query();
236
 
  lex->value_list.empty();
237
 
  lex->update_list.empty();
238
 
  lex->auxiliary_table_list.empty();
 
236
  lex->value_list.clear();
 
237
  lex->update_list.clear();
 
238
  lex->auxiliary_table_list.clear();
239
239
  lex->unit.next= lex->unit.master=
240
240
    lex->unit.link_next= lex->unit.return_to= 0;
241
241
  lex->unit.prev= lex->unit.link_prev= 0;
247
247
  lex->select_lex.link_prev= (Select_Lex_Node**)&(lex->all_selects_list);
248
248
  lex->select_lex.options= 0;
249
249
  lex->select_lex.init_order();
250
 
  lex->select_lex.group_list.empty();
 
250
  lex->select_lex.group_list.clear();
251
251
  lex->describe= 0;
252
252
  lex->derived_tables= 0;
253
253
  lex->lock_option= TL_READ;
256
256
  lex->select_lex.select_number= 1;
257
257
  lex->length=0;
258
258
  lex->select_lex.in_sum_expr=0;
259
 
  lex->select_lex.group_list.empty();
260
 
  lex->select_lex.order_list.empty();
 
259
  lex->select_lex.group_list.clear();
 
260
  lex->select_lex.order_list.clear();
261
261
  lex->sql_command= SQLCOM_END;
262
262
  lex->duplicates= DUP_ERROR;
263
263
  lex->ignore= 0;
1335
1335
  table= 0;
1336
1336
  fake_select_lex= 0;
1337
1337
  cleaned= 0;
1338
 
  item_list.empty();
 
1338
  item_list.clear();
1339
1339
  describe= 0;
1340
1340
  found_rows_for_union= 0;
1341
1341
}
1343
1343
void Select_Lex::init_query()
1344
1344
{
1345
1345
  Select_Lex_Node::init_query();
1346
 
  table_list.empty();
1347
 
  top_join_list.empty();
 
1346
  table_list.clear();
 
1347
  top_join_list.clear();
1348
1348
  join_list= &top_join_list;
1349
1349
  embedding= leaf_tables= 0;
1350
 
  item_list.empty();
 
1350
  item_list.clear();
1351
1351
  join= 0;
1352
1352
  having= where= 0;
1353
1353
  olap= UNSPECIFIED_OLAP_TYPE;
1379
1379
 
1380
1380
void Select_Lex::init_select()
1381
1381
{
1382
 
  sj_nests.empty();
1383
 
  group_list.empty();
 
1382
  sj_nests.clear();
 
1383
  group_list.clear();
1384
1384
  db= 0;
1385
1385
  having= 0;
1386
1386
  in_sum_expr= with_wild= 0;
1387
1387
  options= 0;
1388
1388
  braces= 0;
1389
 
  interval_list.empty();
 
1389
  interval_list.clear();
1390
1390
  inner_sum_func_list= 0;
1391
1391
  linkage= UNSPECIFIED_TYPE;
1392
1392
  order_list.elements= 0;
1399
1399
  is_cross= false;
1400
1400
  is_correlated= 0;
1401
1401
  cur_pos_in_select_list= UNDEF_POS;
1402
 
  non_agg_fields.empty();
 
1402
  non_agg_fields.clear();
1403
1403
  cond_value= having_value= Item::COND_UNDEF;
1404
 
  inner_refs_list.empty();
 
1404
  inner_refs_list.clear();
1405
1405
  full_group_by_flag.reset();
1406
1406
}
1407
1407