← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_lex.h

  • Committer: Joe Daly
  • Date: 2010-05-27 02:59:16 UTC
  • mto: This revision was merged to the branch mainline in revision 1614.
  • Revision ID: skinny.moey@gmail.com-20100527025916-o4wieb1hxk2shq4u
add status_vars to scoreboard, initial pass

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_lex.h
258
258
    return memory::sql_alloc(size);
259
259
  }
260
260
  static void *operator new(size_t size, memory::Root *mem_root)
261
 
  { return (void*) alloc_root(mem_root, (uint32_t) size); }
 
261
  { return (void*) mem_root->alloc_root((uint32_t) size); }
262
262
  static void operator delete(void *, size_t)
263
263
  {  }
264
264
  static void operator delete(void *, memory::Root *)
305
305
*/
306
306
class Session;
307
307
class select_result;
308
 
class JOIN;
 
308
class Join;
309
309
class select_union;
310
310
class Select_Lex_Unit: public Select_Lex_Node {
311
311
protected:
422
422
  List<Item> item_list;  /* list of fields & expressions */
423
423
  List<String> interval_list;
424
424
  bool is_item_list_lookup;
425
 
  JOIN *join; /* after JOIN::prepare it is pointer to corresponding JOIN */
 
425
  Join *join; /* after Join::prepare it is pointer to corresponding JOIN */
426
426
  List<TableList> top_join_list; /* join list of the top level          */
427
427
  List<TableList> *join_list;    /* list for the currently parsed join  */
428
428
  TableList *embedding;          /* table embedding to the above list   */