← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2010-05-09 23:33:20 UTC
  • mfrom: (1502.1.22 fix-myisam)
  • Revision ID: brian@gaz-20100509233320-2ejod14ukaiqoqjk
Merge in modifications to make TableShare and actual object. 

Crazy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1740
1740
  plugin::StorageEngine *table_type= table->s->db_type();
1741
1741
 
1742
1742
  table->free_io_cache();
1743
 
  table->closefrm(false);
 
1743
  table->delete_table(false);
1744
1744
 
1745
 
  TableIdentifier identifier(table->s->getSchemaName(), table->s->table_name.str, table->s->path.str);
 
1745
  TableIdentifier identifier(table->s->getSchemaName(), table->s->getTableName(), table->s->getPath());
1746
1746
  rm_temporary_table(table_type, identifier);
1747
1747
 
1748
 
  table->s->free_table_share();
 
1748
  delete table->s;
1749
1749
 
1750
1750
  /* This makes me sad, but we're allocating it via malloc */
1751
1751
  free(table);
2014
2014
 
2015
2015
    if (have_proto)
2016
2016
    {
2017
 
      cerr << "\tTable Name " << table->s->getSchemaName() << "." << table->s->table_name.str << " : " << answer << "\n";
 
2017
      cerr << "\tTable Name " << table->s->getSchemaName() << "." << table->s->getTableName() << " : " << answer << "\n";
2018
2018
      cerr << "\t\t Proto " << proto->schema() << " " << proto->name() << "\n";
2019
2019
    }
2020
2020
    else
2021
 
      cerr << "\tTabl;e Name " << table->s->getSchemaName() << "." << table->s->table_name.str << " : " << answer << "\n";
 
2021
      cerr << "\tTabl;e Name " << table->s->getSchemaName() << "." << table->s->getTableName() << " : " << answer << "\n";
2022
2022
  }
2023
2023
}
2024
2024