← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbxt/src/ha_pbxt.cc

  • Committer: Monty Taylor
  • Date: 2010-07-06 00:44:32 UTC
  • mfrom: (1643.1.13 build)
  • Revision ID: mordred@inaugust.com-20100706004432-843uftc92rc2497l
Merged in PBMS, translation updates, a few build fixes and a few bug fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbxt/src/ha_pbxt.cc
3961
3961
                        stats.block_size = XT_INDEX_PAGE_SIZE;
3962
3962
 
3963
3963
#ifdef DRIZZLED
3964
 
                        if (share->tmp_table == message::Table::STANDARD)
 
3964
                        if (share->getType() == message::Table::STANDARD)
3965
3965
#else
3966
3966
                        if (share->tmp_table == NO_TMP_TABLE)
3967
3967
#endif
4017
4017
                                        table->key_info[i].rec_per_key[j] = (ulong) rec_per_key;
4018
4018
                        }
4019
4019
#ifdef DRIZZLED
4020
 
                        if (share->tmp_table == message::Table::STANDARD)
 
4020
                        if (share->getType() == message::Table::STANDARD)
4021
4021
#else
4022
4022
                        if (share->tmp_table == NO_TMP_TABLE)
4023
4023
#endif
5252
5252
 * the storage engine.
5253
5253
*/
5254
5254
#ifdef DRIZZLED
5255
 
int PBXTStorageEngine::doDropTable(Session &, TableIdentifier& ident)
 
5255
int PBXTStorageEngine::doDropTable(Session &, const TableIdentifier& ident)
5256
5256
{
5257
5257
        const std::string& path = ident.getPath();
5258
5258
        const char *table_path = path.c_str();
5404
5404
 */
5405
5405
#ifdef DRIZZLED
5406
5406
int PBXTStorageEngine::doRenameTable(Session&,
5407
 
                                     TableIdentifier& from_ident,
5408
 
                                     TableIdentifier& to_ident)
 
5407
                                     const TableIdentifier& from_ident,
 
5408
                                     const TableIdentifier& to_ident)
5409
5409
{
5410
5410
        const char *from = from_ident.getPath().c_str();
5411
5411
        const char *to = to_ident.getPath().c_str();
5596
5596
*/
5597
5597
int PBXTStorageEngine::doCreateTable(Session&, 
5598
5598
                                     Table& table_arg, 
5599
 
                                     TableIdentifier& ident,
 
5599
                                     const TableIdentifier& ident,
5600
5600
                                     drizzled::message::Table& proto)
5601
5601
{
5602
5602
        const std::string& path = ident.getPath();
5857
5857
}
5858
5858
#endif
5859
5859
 
5860
 
bool PBXTStorageEngine::doDoesTableExist(Session&, TableIdentifier &identifier)
 
5860
bool PBXTStorageEngine::doDoesTableExist(Session&, const TableIdentifier &identifier)
5861
5861
{
5862
5862
  std::string proto_path(identifier.getPath());
5863
5863
  proto_path.append(DEFAULT_FILE_EXTENSION);