← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

Merged captain branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
71
71
{
72
72
public:
73
73
  MyisamEngine(string name_arg)
74
 
   : StorageEngine(name_arg, HTON_CAN_RECREATE | HTON_TEMPORARY_ONLY) {}
 
74
   : StorageEngine(name_arg, HTON_CAN_RECREATE | HTON_TEMPORARY_ONLY | HTON_FILE_BASED) {}
75
75
 
76
76
  virtual handler *create(TableShare *table,
77
77
                          MEM_ROOT *mem_root)
83
83
    return ha_myisam_exts;
84
84
  }
85
85
 
86
 
  int createTableImpl(Session *, const char *table_name,
87
 
                      Table *table_arg, HA_CREATE_INFO *ha_create_info);
88
 
 
89
 
  int renameTableImpl(Session*, const char *from, const char *to);
90
 
 
91
 
  int deleteTableImpl(Session*, const string table_name);
 
86
  int createTableImplementation(Session *, const char *table_name,
 
87
                                Table *table_arg,
 
88
                                HA_CREATE_INFO *ha_create_info,
 
89
                                drizzled::message::Table*);
 
90
 
 
91
  int renameTableImplementation(Session*, const char *from, const char *to);
 
92
 
 
93
  int deleteTableImplementation(Session*, const string table_name);
92
94
};
93
95
 
94
96
// collect errors printed by mi_check routines
507
509
                  HA_DUPLICATE_POS |
508
510
                  HA_CAN_INDEX_BLOBS |
509
511
                  HA_AUTO_PART_KEY |
510
 
                  HA_FILE_BASED |
511
512
                  HA_NO_TRANSACTIONS |
512
513
                  HA_HAS_RECORDS |
513
514
                  HA_STATS_RECORDS_IS_EXACT |
1566
1567
  return mi_delete_all_rows(file);
1567
1568
}
1568
1569
 
1569
 
int MyisamEngine::deleteTableImpl(Session*, const string table_name)
 
1570
int MyisamEngine::deleteTableImplementation(Session*, const string table_name)
1570
1571
{
1571
1572
  return mi_delete_table(table_name.c_str());
1572
1573
}
1603
1604
}
1604
1605
 
1605
1606
 
1606
 
int MyisamEngine::createTableImpl(Session *, const char *table_name,
1607
 
                                  Table *table_arg,
1608
 
                                  HA_CREATE_INFO *ha_create_info)
 
1607
int MyisamEngine::createTableImplementation(Session *, const char *table_name,
 
1608
                                            Table *table_arg,
 
1609
                                            HA_CREATE_INFO *ha_create_info,
 
1610
                                            drizzled::message::Table*)
1609
1611
{
1610
1612
  int error;
1611
1613
  uint32_t create_flags= 0, create_records;
1653
1655
}
1654
1656
 
1655
1657
 
1656
 
int MyisamEngine::renameTableImpl(Session*, const char *from, const char *to)
 
1658
int MyisamEngine::renameTableImplementation(Session*,
 
1659
                                            const char *from, const char *to)
1657
1660
{
1658
1661
  return mi_rename(from,to);
1659
1662
}