← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_index_merge_select.h

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_index_merge_select.h
139
139
  /* true if this select is currently doing a clustered PK scan */
140
140
  bool  doing_pk_scan;
141
141
 
142
 
  drizzled::memory::Root alloc;
 
142
  memory::Root alloc;
143
143
  Session *session;
144
144
 
145
145
  /**