← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.h

merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.h
21
21
#define DRIZZLED_SQL_BASE_H
22
22
 
23
23
#include <drizzled/table.h>
 
24
#include <drizzled/table/concurrent.h>
24
25
 
25
26
namespace drizzled
26
27
{
32
33
uint32_t cached_open_tables(void);
33
34
uint32_t cached_table_definitions(void);
34
35
 
35
 
typedef boost::unordered_multimap< TableIdentifier::Key, Table *> TableOpenCache;
36
 
typedef std::pair< TableOpenCache::const_iterator, TableOpenCache::const_iterator > TableOpenCacheRange;
37
 
 
38
 
TableOpenCache &get_open_cache();
39
 
void remove_table(Table *arg);
 
36
table::Cache &get_open_cache();
40
37
 
41
38
void kill_drizzle(void);
42
39
 
135
132
                               const char *table_name);
136
133
TableList *unique_table(TableList *table, TableList *table_list,
137
134
                        bool check_alias= false);
138
 
void remove_db_from_cache(const SchemaIdentifier &schema_identifier);
139
135
 
140
 
/* bits for last argument to remove_table_from_cache() */
 
136
/* bits for last argument to table::Cache::singleton().removeTable() */
141
137
#define RTFC_NO_FLAG                0x0000
142
138
#define RTFC_OWNED_BY_Session_FLAG      0x0001
143
139
#define RTFC_WAIT_OTHER_THREAD_FLAG 0x0002
144
140
#define RTFC_CHECK_KILLED_FLAG      0x0004
145
 
bool remove_table_from_cache(Session *session, TableIdentifier &identifier, uint32_t flags);
146
141
 
147
142
void mem_alloc_error(size_t size);
148
143