← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.h

  • Committer: Stewart Smith
  • Date: 2011-01-21 01:09:12 UTC
  • mfrom: (2099 staging)
  • mto: (2099.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2100.
  • Revision ID: stewart@flamingspork.com-20110121010912-x5ogi8rm08nortxp
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.h
180
180
  DrizzleLock *lock;
181
181
 
182
182
  Join *tmp_join; /**< copy of this Join to be used with temporary tables */
183
 
  ROLLUP rollup;                                /**< Used with rollup */
 
183
  Rollup rollup;                                /**< Used with rollup */
184
184
  DYNAMIC_ARRAY keyuse;
185
185
  Item::cond_result cond_value;
186
186
  Item::cond_result having_value;
306
306
    memset(&keyuse, 0, sizeof(keyuse));
307
307
    tmp_table_param.init();
308
308
    tmp_table_param.end_write_records= HA_POS_ERROR;
309
 
    rollup.state= ROLLUP::STATE_NONE;
 
309
    rollup.setState(Rollup::STATE_NONE);
310
310
  }
311
311
 
312
312
  /** 
395
395
    memset(&keyuse, 0, sizeof(keyuse));
396
396
    tmp_table_param.init();
397
397
    tmp_table_param.end_write_records= HA_POS_ERROR;
398
 
    rollup.state= ROLLUP::STATE_NONE;
 
398
    rollup.setState(Rollup::STATE_NONE);
399
399
  }
400
400
 
401
401
  int prepare(Item ***rref_pointer_array,