← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.h

  • Committer: Brian Aker
  • Date: 2011-01-13 01:27:33 UTC
  • mfrom: (2069.4.4 clean)
  • mto: This revision was merged to the branch mainline in revision 2078.
  • Revision ID: brian@gir-3-20110113012733-1xg5mqvu1f0i1urr
Merge in the move for share to be the instance for table.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.h
33
33
#include "drizzled/cursor.h"
34
34
#include "drizzled/lex_string.h"
35
35
#include "drizzled/table_list.h"
36
 
#include "drizzled/definition/table.h"
 
36
#include "drizzled/table/instance.h"
37
37
#include "drizzled/atomics.h"
38
38
#include "drizzled/query_id.h"
39
39
 
850
850
 
851
851
} /* namespace drizzled */
852
852
 
853
 
#include "drizzled/table/instance.h"
 
853
#include "drizzled/table/singular.h"
854
854
#include "drizzled/table/concurrent.h"
855
855
 
856
856
#endif /* DRIZZLED_TABLE_H */