← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 01:45:34 UTC
  • mfrom: (1878.5.8 catalogs)
  • Revision ID: brian@tangent.org-20101028014534-b6qp4wp6crj60h7k
Merge in catalog tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
510
510
 
511
511
  if (type_arg == message::Table::INTERNAL)
512
512
  {
513
 
    TableIdentifier::build_tmptable_filename(private_key_for_cache);
514
 
    init(&private_key_for_cache[0], &private_key_for_cache[0]);
 
513
    TableIdentifier::build_tmptable_filename(private_key_for_cache.vectorPtr());
 
514
    init(private_key_for_cache.vector(), private_key_for_cache.vector());
515
515
  }
516
516
  else
517
517
  {
582
582
  table_category=         TABLE_CATEGORY_TEMPORARY;
583
583
  tmp_table=              message::Table::INTERNAL;
584
584
 
585
 
  db.str= &private_key_for_cache[0];
586
 
  db.length= strlen(&private_key_for_cache[0]);
 
585
  db.str= const_cast<char *>(private_key_for_cache.vector());
 
586
  db.length= strlen(private_key_for_cache.vector());
587
587
 
588
 
  table_name.str= &private_key_for_cache[0] + strlen(&private_key_for_cache[0]) + 1;
 
588
  table_name.str= const_cast<char *>(private_key_for_cache.vector()) + strlen(private_key_for_cache.vector()) + 1;
589
589
  table_name.length= strlen(table_name.str);
590
590
  path.str= (char *)"";
591
591
  normalized_path.str= path.str;
661
661
  {
662
662
    table_category=         TABLE_CATEGORY_TEMPORARY;
663
663
    tmp_table=              message::Table::INTERNAL;
664
 
    db.str= &private_key_for_cache[0];
665
 
    db.length= strlen(&private_key_for_cache[0]);
 
664
    db.str= const_cast<char *>(private_key_for_cache.vector());
 
665
    db.length= strlen(private_key_for_cache.vector());
666
666
    table_name.str= db.str + 1;
667
667
    table_name.length= strlen(table_name.str);
668
668
    path.str= &private_normalized_path[0];
744
744
    Let us use the fact that the key is "db/0/table_name/0" + optional
745
745
    part for temporary tables.
746
746
  */
747
 
  db.str= &private_key_for_cache[0];
 
747
  db.str= const_cast<char *>(private_key_for_cache.vector());
748
748
  db.length=         strlen(db.str);
749
749
  table_name.str=    db.str + db.length + 1;
750
750
  table_name.length= strlen(table_name.str);
819
819
 
820
820
void TableShare::setIdentifier(TableIdentifier &identifier_arg)
821
821
{
822
 
  private_key_for_cache.clear();
823
822
  private_key_for_cache= identifier_arg.getKey();
824
823
 
825
824
  /*
826
825
    Let us use the fact that the key is "db/0/table_name/0" + optional
827
826
    part for temporary tables.
828
827
  */
829
 
  db.str= &private_key_for_cache[0];
 
828
  db.str= const_cast<char *>(private_key_for_cache.vector());
830
829
  db.length=         strlen(db.str);
831
830
  table_name.str=    db.str + db.length + 1;
832
831
  table_name.length= strlen(table_name.str);