← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/ha_heap.cc

  • Committer: Brian Aker
  • Date: 2010-03-19 01:45:58 UTC
  • mfrom: (1358.1.8 build)
  • Revision ID: brian@gaz-20100319014558-wq2snrpbdz3e8lwo
Merge Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/ha_heap.cc
63
63
  }
64
64
 
65
65
  int doCreateTable(Session *session,
66
 
                    const char *table_name,
67
66
                    Table& table_arg,
68
67
                    drizzled::TableIdentifier &identifier,
69
68
                    message::Table &create_proto);
84
83
  int doDropTable(Session&, TableIdentifier &identifier);
85
84
 
86
85
  int doGetTableDefinition(Session& session,
87
 
                           const char* path,
88
 
                           const char *db,
89
 
                           const char *table_name,
90
 
                           const bool is_tmp,
91
86
                           TableIdentifier &identifier,
92
87
                           message::Table &table_message);
93
88
 
111
106
};
112
107
 
113
108
int HeapEngine::doGetTableDefinition(Session&,
114
 
                                     const char* path,
115
 
                                     const char *,
116
 
                                     const char *,
117
 
                                     const bool,
118
 
                                     TableIdentifier &,
 
109
                                     TableIdentifier &identifier,
119
110
                                     message::Table &table_proto)
120
111
{
121
112
  int error= ENOENT;
122
113
  ProtoCache::iterator iter;
123
114
 
124
115
  pthread_mutex_lock(&proto_cache_mutex);
125
 
  iter= proto_cache.find(path);
 
116
  iter= proto_cache.find(identifier.getPath());
126
117
 
127
118
  if (iter!= proto_cache.end())
128
119
  {
692
683
}
693
684
 
694
685
int HeapEngine::doCreateTable(Session *session,
695
 
                              const char *table_name,
696
686
                              Table &table_arg,
697
 
                              drizzled::TableIdentifier &,
 
687
                              drizzled::TableIdentifier &identifier,
698
688
                              message::Table& create_proto)
699
689
{
700
690
  int error;
701
691
  HP_SHARE *internal_share;
 
692
  const char *table_name= identifier.getPath();
702
693
 
703
694
  error= heap_create_table(session, table_name, &table_arg,
704
695
                           false,