← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge Stewart's basic discovery branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1436
1436
    "memory" engine which will be configurable longterm. We should be able to
1437
1437
    remove partition and myisammrg.
1438
1438
  */
1439
 
  const LEX_STRING myisam_engine_name= { C_STRING_WITH_LEN("MyISAM") };
1440
 
  const LEX_STRING heap_engine_name= { C_STRING_WITH_LEN("MEMORY") };
1441
 
  myisam_engine= ha_resolve_by_name(NULL, &myisam_engine_name);
1442
 
  heap_engine= ha_resolve_by_name(NULL, &heap_engine_name);
 
1439
  const std::string myisam_engine_name("MyISAM");
 
1440
  const std::string heap_engine_name("MEMORY");
 
1441
  myisam_engine= ha_resolve_by_name(NULL, myisam_engine_name);
 
1442
  heap_engine= ha_resolve_by_name(NULL, heap_engine_name);
1443
1443
 
1444
1444
  /*
1445
1445
    Check that the default storage engine is actually available.
1446
1446
  */
1447
1447
  if (default_storage_engine_str)
1448
1448
  {
1449
 
    LEX_STRING name= { default_storage_engine_str,
1450
 
                       strlen(default_storage_engine_str) };
 
1449
    const std::string name(default_storage_engine_str);
1451
1450
    StorageEngine *engine;
1452
1451
 
1453
 
    if (!(engine= ha_resolve_by_name(0, &name)))
 
1452
    engine= ha_resolve_by_name(0, name);
 
1453
    if (engine == NULL)
1454
1454
    {
1455
1455
      errmsg_printf(ERRMSG_LVL_ERROR, _("Unknown/unsupported table type: %s"),
1456
1456
                    default_storage_engine_str);