← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 14:19:48 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923141948-ktph2kg13addaxq1
Actually removed VOID() this time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
4453
4453
          keyuse.null_rejecting= key_field->null_rejecting;
4454
4454
          keyuse.cond_guard= key_field->cond_guard;
4455
4455
          keyuse.sj_pred_no= key_field->sj_pred_no;
4456
 
          VOID(insert_dynamic(keyuse_array,(uchar*) &keyuse));
 
4456
          insert_dynamic(keyuse_array,(uchar*) &keyuse);
4457
4457
        }
4458
4458
      }
4459
4459
    }
4682
4682
          (qsort_cmp) sort_keyuse);
4683
4683
 
4684
4684
    memset(&key_end, 0, sizeof(key_end)); /* Add for easy testing */
4685
 
    VOID(insert_dynamic(keyuse,(uchar*) &key_end));
 
4685
    insert_dynamic(keyuse,(uchar*) &key_end);
4686
4686
 
4687
4687
    use=save_pos=dynamic_element(keyuse,0,KEYUSE*);
4688
4688
    prev= &key_end;
4715
4715
      save_pos++;
4716
4716
    }
4717
4717
    i=(uint) (save_pos-(KEYUSE*) keyuse->buffer);
4718
 
    VOID(set_dynamic(keyuse,(uchar*) &key_end,i));
 
4718
    set_dynamic(keyuse,(uchar*) &key_end,i);
4719
4719
    keyuse->elements=i;
4720
4720
  }
4721
4721
  return false;
10277
10277
        li.remove();
10278
10278
      else if (item != new_item)
10279
10279
      {
10280
 
        VOID(li.replace(new_item));
 
10280
        li.replace(new_item);
10281
10281
        should_fix_fields=1;
10282
10282
      }
10283
10283
      if (*cond_value == Item::COND_UNDEF)
10602
10602
 
10603
10603
  if (table)
10604
10604
  {
10605
 
    VOID(table->file->extra(HA_EXTRA_WRITE_CACHE));
 
10605
    table->file->extra(HA_EXTRA_WRITE_CACHE);
10606
10606
    empty_record(table);
10607
10607
    if (table->group && join->tmp_table_param.sum_func_count &&
10608
10608
        table->s->keys && !table->file->inited)
12015
12015
      if (end_of_records)
12016
12016
        return(NESTED_LOOP_OK);
12017
12017
      join->first_record=1;
12018
 
      VOID(test_if_item_cache_changed(join->group_fields));
 
12018
      test_if_item_cache_changed(join->group_fields);
12019
12019
    }
12020
12020
    if (idx < (int) join->send_group_parts)
12021
12021
    {
12273
12273
      if (end_of_records)
12274
12274
        return(NESTED_LOOP_OK);
12275
12275
      join->first_record=1;
12276
 
      VOID(test_if_item_cache_changed(join->group_fields));
 
12276
      test_if_item_cache_changed(join->group_fields);
12277
12277
    }
12278
12278
    if (idx < (int) join->send_group_parts)
12279
12279
    {