← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

  • Committer: Brian Aker
  • Date: 2009-04-13 16:22:40 UTC
  • mfrom: (971.1.78 mordred)
  • Revision ID: brian@gaz-20090413162240-ugi3gvhofmcuglzl
Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
1807
1807
  return COMPATIBLE_DATA_YES;
1808
1808
}
1809
1809
 
1810
 
int myisam_deinit(void *p)
1811
 
{
1812
 
 
1813
 
  MyisamEngine *engine= static_cast<MyisamEngine *>(p);
 
1810
static MyisamEngine *engine= NULL;
 
1811
 
 
1812
static int myisam_init(PluginRegistry &registry)
 
1813
{
 
1814
  engine= new MyisamEngine(engine_name);
 
1815
  registry.add(engine);
 
1816
 
 
1817
  pthread_mutex_init(&THR_LOCK_myisam,MY_MUTEX_INIT_FAST);
 
1818
 
 
1819
  return 0;
 
1820
}
 
1821
 
 
1822
int myisam_deinit(PluginRegistry &registry)
 
1823
{
 
1824
  registry.remove(engine);
1814
1825
  delete engine;
1815
1826
 
1816
1827
  pthread_mutex_destroy(&THR_LOCK_myisam);
1818
1829
  return mi_panic(HA_PANIC_CLOSE);
1819
1830
}
1820
1831
 
1821
 
static int myisam_init(void *p)
1822
 
{
1823
 
  StorageEngine **engine= static_cast<StorageEngine **>(p);
1824
 
  
1825
 
  *engine= new MyisamEngine(engine_name);
1826
 
 
1827
 
  return 0;
1828
 
}
1829
 
 
1830
 
 
1831
1832
 
1832
1833
/****************************************************************************
1833
1834
 * MyISAM MRR implementation: use DS-MRR
1924
1925
 
1925
1926
drizzle_declare_plugin(myisam)
1926
1927
{
1927
 
  DRIZZLE_STORAGE_ENGINE_PLUGIN,
1928
1928
  "MyISAM",
1929
1929
  "1.0",
1930
1930
  "MySQL AB",