← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
2213
2213
                              bool before_group_by, 
2214
2214
                              bool recompute)
2215
2215
{
2216
 
  List<Item>::iterator it(field_list);
 
2216
  List<Item>::iterator it(field_list.begin());
2217
2217
  Item_sum **func;
2218
2218
  Item *item;
2219
2219
 
2294
2294
    }
2295
2295
  }
2296
2296
 
2297
 
  List<Item>::iterator it(all_fields);
 
2297
  List<Item>::iterator it(all_fields.begin());
2298
2298
  Item *item;
2299
2299
  while ((item= it++))
2300
2300
  {
2369
2369
*/
2370
2370
bool Join::rollup_make_fields(List<Item> &fields_arg, List<Item> &sel_fields, Item_sum ***func)
2371
2371
{
2372
 
  List<Item>::iterator it(fields_arg);
 
2372
  List<Item>::iterator it(fields_arg.begin());
2373
2373
  Item *first_field= sel_fields.head();
2374
2374
  uint32_t level;
2375
2375
 
2400
2400
    uint32_t pos= send_group_parts - level -1;
2401
2401
    bool real_fields= 0;
2402
2402
    Item *item;
2403
 
    List<Item>::iterator new_it(rollup.getFields()[pos]);
 
2403
    List<Item>::iterator new_it(rollup.getFields()[pos].begin());
2404
2404
    Item **ref_array_start= rollup.getRefPointerArrays()[pos];
2405
2405
    Order *start_group;
2406
2406
 
2549
2549
    {
2550
2550
      int write_error;
2551
2551
      Item *item;
2552
 
      List<Item>::iterator it(rollup.getFields()[i]);
 
2552
      List<Item>::iterator it(rollup.getFields()[i].begin());
2553
2553
      while ((item= it++))
2554
2554
      {
2555
2555
        if (item->type() == Item::NULL_ITEM && item->is_result_field())
5292
5292
  {
5293
5293
    if (send_row)
5294
5294
    {
5295
 
      List<Item>::iterator it(fields);
 
5295
      List<Item>::iterator it(fields.begin());
5296
5296
      Item *item;
5297
5297
      while ((item= it++))
5298
5298
        item->no_rows_in_result();
5430
5430
  TableList *table;
5431
5431
  NestedJoin *nested_join;
5432
5432
  TableList *prev_table= 0;
5433
 
  List<TableList>::iterator li(*join_list);
 
5433
  List<TableList>::iterator li(join_list->begin());
5434
5434
 
5435
5435
  /*
5436
5436
    Try to simplify join operations from join_list.
5573
5573
    if (nested_join && !table->on_expr)
5574
5574
    {
5575
5575
      TableList *tbl;
5576
 
      List<TableList>::iterator it(nested_join->join_list);
 
5576
      List<TableList>::iterator it(nested_join->join_list.begin());
5577
5577
      while ((tbl= it++))
5578
5578
      {
5579
5579
        tbl->setEmbedding(table->getEmbedding());
5596
5596
 
5597
5597
  /* Calculate how many saved fields there is in list */
5598
5598
  field_count=0;
5599
 
  List<Item>::iterator it(fields);
 
5599
  List<Item>::iterator it(fields.begin());
5600
5600
  Item *item;
5601
5601
  while ((item=it++))
5602
5602
  {
6138
6138
*/
6139
6139
static uint32_t build_bitmap_for_nested_joins(List<TableList> *join_list, uint32_t first_unused)
6140
6140
{
6141
 
  List<TableList>::iterator li(*join_list);
 
6141
  List<TableList>::iterator li(join_list->begin());
6142
6142
  TableList *table;
6143
6143
  while ((table= li++))
6144
6144
  {
6209
6209
*/
6210
6210
static void reset_nj_counters(List<TableList> *join_list)
6211
6211
{
6212
 
  List<TableList>::iterator li(*join_list);
 
6212
  List<TableList>::iterator li(join_list->begin());
6213
6213
  TableList *table;
6214
6214
  while ((table= li++))
6215
6215
  {