← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.h

  • Committer: Lee Bieber
  • Date: 2010-11-05 20:22:41 UTC
  • mfrom: (1907.1.2 build)
  • Revision ID: kalebral@gmail.com-20101105202241-1fm31t0y0fvdwcd3
Merge Brian - Adding FileSort class, merge in catalog tree
Merge Joe - fix bug 670971: InnoDB does not complete shutdown with transaction log enabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.h
173
173
 
174
174
private:
175
175
  memory::Root mem_root;
176
 
public:
 
176
 
177
177
  void *alloc_root(size_t arg)
178
178
  {
179
179
    return mem_root.alloc_root(arg);
189
189
    return &mem_root;
190
190
  }
191
191
 
192
 
private:
193
192
  std::vector<std::string> _keynames;
194
193
 
195
194
  void addKeyName(std::string arg)
295
294
    return private_key_for_cache.size();
296
295
  }
297
296
 
 
297
private:
298
298
  void setPath(char *str_arg, uint32_t size_arg)
299
299
  {
300
300
    path.str= str_arg;
306
306
    normalized_path.str= str_arg;
307
307
    normalized_path.length= size_arg;
308
308
  }
 
309
public:
309
310
 
310
311
  const char *getTableName() const
311
312
  {