← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.h

  • Committer: Monty Taylor
  • Date: 2010-05-24 19:34:46 UTC
  • mto: This revision was merged to the branch mainline in revision 1564.
  • Revision ID: mordred@inaugust.com-20100524193446-j74n0rvylqdnttld
Updated translations to what's in the tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.h
177
177
  uint64_t select_options;
178
178
  select_result *result;
179
179
  Tmp_Table_Param tmp_table_param;
180
 
  DrizzleLock *lock;
 
180
  DRIZZLE_LOCK *lock;
181
181
 
182
182
  Join *tmp_join; /**< copy of this Join to be used with temporary tables */
183
183
  ROLLUP rollup;                                /**< Used with rollup */
219
219
    allocations that occur in repetition at execution time will result in
220
220
    excessive memory usage.
221
221
  */
222
 
  SortField *sortorder;                        // make_unireg_sortorder()
 
222
  SORT_FIELD *sortorder;                        // make_unireg_sortorder()
223
223
  Table **table_reexec;                         // make_simple_join()
224
224
  JoinTable *join_tab_reexec;                    // make_simple_join()
225
225
  /* end of allocation caching storage */