← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merged in plugin-registration.  handlerton now == StorageEngine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
255
255
size_t my_thread_stack_size= 65536;
256
256
 
257
257
/*
258
 
  Legacy global handlerton. These will be removed (please do not add more).
 
258
  Legacy global StorageEngine. These will be removed (please do not add more).
259
259
*/
260
 
handlerton *heap_hton;
261
 
handlerton *myisam_hton;
 
260
StorageEngine *heap_engine;
 
261
StorageEngine *myisam_engine;
262
262
 
263
263
bool use_temp_pool;
264
264
char* opt_secure_file_priv= 0;
1626
1626
    LEX_STRING name= { default_storage_engine_str,
1627
1627
                       strlen(default_storage_engine_str) };
1628
1628
    plugin_ref plugin;
1629
 
    handlerton *hton;
 
1629
    StorageEngine *engine;
1630
1630
 
1631
1631
    if ((plugin= ha_resolve_by_name(0, &name)))
1632
1632
    {
1633
 
      hton= plugin_data(plugin,handlerton *);
 
1633
      engine= plugin_data(plugin,StorageEngine *);
1634
1634
    }
1635
1635
    else
1636
1636
    {
1638
1638
                      default_storage_engine_str);
1639
1639
      unireg_abort(1);
1640
1640
    }
1641
 
    if (!ha_storage_engine_is_enabled(hton))
 
1641
    if (!ha_storage_engine_is_enabled(engine))
1642
1642
    {
1643
1643
      errmsg_printf(ERRMSG_LVL_ERROR, _("Default storage engine (%s) is not available"),
1644
1644
                    default_storage_engine_str);