← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.h

  • Committer: Brian Aker
  • Date: 2009-07-29 18:35:48 UTC
  • mfrom: (1101.1.12 merge)
  • Revision ID: brian@gaz-20090729183548-yp36iwoaemfc76z0
Merging Monty (which includes new replication)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.h
140
140
  nested_join_map cur_embedding_map;
141
141
 
142
142
  double best_read;
143
 
  List<Cached_item> group_fields;
144
 
  List<Cached_item> group_fields_cache;
 
143
  std::vector<Cached_item*> group_fields;
 
144
  std::vector<Cached_item*> group_fields_cache;
145
145
  Table *tmp_table;
146
146
  /** used to store 2 possible tmp table of SELECT */
147
147
  Table *exec_tmp_table1;
285
285
    if (&fields_list != &fields_arg) /* only copy if not same*/
286
286
      fields_list= fields_arg;
287
287
    memset(&keyuse, 0, sizeof(keyuse));
288
 
    tmp_table_param.init();
289
288
    tmp_table_param.end_write_records= HA_POS_ERROR;
290
289
    rollup.state= ROLLUP::STATE_NONE;
291
290
  }
374
373
    if (&fields_list != &fields_arg) /* only copy if not same*/
375
374
      fields_list= fields_arg;
376
375
    memset(&keyuse, 0, sizeof(keyuse));
377
 
    tmp_table_param.init();
378
376
    tmp_table_param.end_write_records= HA_POS_ERROR;
379
377
    rollup.state= ROLLUP::STATE_NONE;
380
378
  }