← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.h

  • Committer: Olaf van der Spek
  • Date: 2011-08-05 11:30:37 UTC
  • mto: This revision was merged to the branch mainline in revision 2395.
  • Revision ID: olafvdspek@gmail.com-20110805113037-qufc9s7ju4w18ize
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.h
305
305
    return table_name.str;
306
306
  }
307
307
 
308
 
  const std::string &getTableName(std::string &name_arg) const
 
308
  std::string getTableNameStr() const
309
309
  {
310
 
    name_arg.assign(table_name.str, table_name.length);
311
 
    return name_arg;
 
310
    return std::string(table_name.str, table_name.length);
312
311
  }
313
312
 
314
313
  const char *getSchemaName() const
316
315
    return db.str;
317
316
  }
318
317
 
319
 
  size_t getSchemaNameSize() const
 
318
  str_ref getSchemaNameRef() const
320
319
  {
321
 
    return db.length;
 
320
    return db;
322
321
  }
323
322
 
324
 
  const std::string &getSchemaName(std::string &schema_name_arg) const
 
323
  std::string getSchemaNameStr() const
325
324
  {
326
 
    schema_name_arg.assign(db.str, db.length);
327
 
    return schema_name_arg;
 
325
    return std::string(db.str, db.length);
328
326
  }
329
327
 
330
328
  uint32_t   block_size;                   /* create information */