← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.h

  • Committer: Andrew Hutchings
  • Date: 2011-02-07 17:20:59 UTC
  • mfrom: (2148 staging)
  • mto: (2148.2.3 build)
  • mto: This revision was merged to the branch mainline in revision 2149.
  • Revision ID: andrew@linuxjedi.co.uk-20110207172059-dyeahrgzrlincoe3
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.h
21
21
#ifndef DRIZZLED_TABLE_LIST_H
22
22
#define DRIZZLED_TABLE_LIST_H
23
23
 
 
24
#include <drizzled/nested_join.h>
24
25
#include <drizzled/table.h>
25
26
 
26
27
namespace drizzled
41
42
  class StorageEngine;
42
43
}
43
44
 
44
 
struct nested_join_st;
45
 
 
46
45
/**
47
46
 * A Table referenced in the FROM clause.
48
47
 *
462
461
    embedding= in_embedding;
463
462
  }
464
463
 
465
 
  void setNestedJoin(nested_join_st *in_nested_join)
 
464
  void setNestedJoin(NestedJoin *in_nested_join)
466
465
  {
467
466
    nested_join= in_nested_join;
468
467
  }
512
511
    return join_list;
513
512
  }
514
513
 
515
 
  nested_join_st *getNestedJoin() const
 
514
  NestedJoin *getNestedJoin() const
516
515
  {
517
516
    return nested_join;
518
517
  }
533
532
private:
534
533
  table_map dep_tables; ///< tables the table depends on
535
534
  table_map on_expr_dep_tables; ///< tables on expression depends on
536
 
  nested_join_st *nested_join; ///< if the element is a nested join
 
535
  NestedJoin *nested_join; ///< if the element is a nested join
537
536
  TableList *embedding; ///< nested join containing the table
538
537
  List<TableList> *join_list; ///< join list the table belongs to
539
538
  plugin::StorageEngine *db_type; ///< table_type for handler