← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
1801
1801
  return COMPATIBLE_DATA_YES;
1802
1802
}
1803
1803
 
1804
 
int myisam_panic(handlerton *hton __attribute__((unused)), ha_panic_function flag)
 
1804
int myisam_deinit(void *hton __attribute__((unused)))
1805
1805
{
1806
 
  return mi_panic(flag);
 
1806
  return mi_panic(HA_PANIC_CLOSE);
1807
1807
}
1808
1808
 
1809
1809
static int myisam_init(void *p)
1814
1814
  myisam_hton->state= SHOW_OPTION_YES;
1815
1815
  myisam_hton->db_type= DB_TYPE_MYISAM;
1816
1816
  myisam_hton->create= myisam_create_handler;
1817
 
  myisam_hton->panic= myisam_panic;
1818
1817
  myisam_hton->flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
1819
1818
  return 0;
1820
1819
}
1886
1885
  "Default engine as of MySQL 3.23 with great performance",
1887
1886
  PLUGIN_LICENSE_GPL,
1888
1887
  myisam_init, /* Plugin Init */
1889
 
  NULL, /* Plugin Deinit */
 
1888
  myisam_deinit, /* Plugin Deinit */
1890
1889
  NULL,                       /* status variables                */
1891
1890
  NULL,                       /* system variables                */
1892
1891
  NULL                        /* config options                  */