← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Olaf van der Spek
  • Date: 2011-07-07 11:47:49 UTC
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110707114749-2r2bgjhk36o06p1n
Refactor build_table_filename

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
297
297
{
298
298
  if (type_arg == message::Table::INTERNAL)
299
299
  {
300
 
    identifier::Table::build_tmptable_filename(private_key_for_cache.vectorPtr());
 
300
    string s= identifier::Table::build_tmptable_filename();
 
301
    private_key_for_cache.vectorPtr().assign(s.c_str(), s.c_str() + s.size() + 1);
301
302
    init(private_key_for_cache.vector(), private_key_for_cache.vector());
302
303
  }
303
304
  else
609
610
  db_create_options= (local_db_create_options & 0x0000FFFF);
610
611
  db_options_in_use= db_create_options;
611
612
 
612
 
  block_size= table_options.has_block_size() ?
613
 
    table_options.block_size() : 0;
 
613
  block_size= table_options.has_block_size() ? table_options.block_size() : 0;
614
614
 
615
615
  table_charset= get_charset(table_options.collation_id());
616
616