← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2009-05-06 06:59:53 UTC
  • mfrom: (1003.1.20 merge)
  • Revision ID: brian@gaz-20090506065953-4mrfmaty42e0ixpq
Merge handler cleanup (and ALTER TABLE cleanup) We go from 1 and 2 half
thought out systems... to just 1.

This should all be changed when we finish the StorageEngine rewrite

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
486
486
ha_myisam::ha_myisam(StorageEngine *engine_arg, TableShare *table_arg)
487
487
  :handler(engine_arg, table_arg), file(0),
488
488
  int_table_flags(HA_NULL_IN_KEY |
489
 
                  HA_BINLOG_ROW_CAPABLE |
490
 
                  HA_BINLOG_STMT_CAPABLE |
491
489
                  HA_DUPLICATE_POS |
492
490
                  HA_CAN_INDEX_BLOBS |
493
491
                  HA_AUTO_PART_KEY |
1780
1778
  return (uint)file->state->checksum;
1781
1779
}
1782
1780
 
1783
 
 
1784
 
bool ha_myisam::check_if_incompatible_data(HA_CREATE_INFO *create_info,
1785
 
                                           uint32_t table_changes)
1786
 
{
1787
 
  uint32_t options= table->s->db_options_in_use;
1788
 
 
1789
 
  if (create_info->auto_increment_value != stats.auto_increment_value ||
1790
 
      create_info->data_file_name != data_file_name ||
1791
 
      create_info->index_file_name != index_file_name ||
1792
 
      table_changes == IS_EQUAL_NO ||
1793
 
      table_changes & IS_EQUAL_PACK_LENGTH) // Not implemented yet
1794
 
    return COMPATIBLE_DATA_NO;
1795
 
 
1796
 
  if ((options & (HA_OPTION_PACK_RECORD | HA_OPTION_CHECKSUM |
1797
 
                  HA_OPTION_DELAY_KEY_WRITE)) !=
1798
 
      (create_info->table_options & (HA_OPTION_PACK_RECORD |
1799
 
                                     HA_OPTION_CHECKSUM |
1800
 
                              HA_OPTION_DELAY_KEY_WRITE)))
1801
 
    return COMPATIBLE_DATA_NO;
1802
 
  return COMPATIBLE_DATA_YES;
1803
 
}
1804
 
 
1805
1781
static MyisamEngine *engine= NULL;
1806
1782
 
1807
1783
static int myisam_init(PluginRegistry &registry)