← 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: 2010-08-03 19:24:14 UTC
  • mto: This revision was merged to the branch mainline in revision 1683.
  • Revision ID: brian@gaz-20100803192414-jk20j0u6cnze3ja6
Do comparison via non-case.

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 */
195
195
  List<Item> tmp_fields_list3;
196
196
  int error;
197
197
 
198
 
  Order *order;
199
 
  Order *group_list; /**< hold parameters of mysql_select */
 
198
  order_st *order;
 
199
  order_st *group_list; /**< hold parameters of mysql_select */
200
200
  COND *conds;                            // ---"---
201
201
  Item *conds_history; /**< store WHERE for explain */
202
202
  TableList *tables_list; /**< hold 'tables' parameter of mysql_select */
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 */
403
403
              uint32_t wind_num,
404
404
              COND *conds,
405
405
              uint32_t og_num,
406
 
              Order *order,
407
 
              Order *group,
 
406
              order_st *order,
 
407
              order_st *group,
408
408
              Item *having,
409
409
              Select_Lex *select,
410
410
              Select_Lex_Unit *unit);