← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

Merged plugin-registration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
2372
2372
{
2373
2373
  unsigned char* result;
2374
2374
  StorageEngine *engine;
2375
 
  LEX_STRING *engine_name;
 
2375
  string engine_name;
2376
2376
  plugin_ref plugin= session->variables.*offset;
2377
2377
  if (type == OPT_GLOBAL)
2378
2378
    plugin= plugin_lock(session, &(global_system_variables.*offset));
2379
2379
  engine= plugin_data(plugin, StorageEngine*);
2380
 
  engine_name= ha_storage_engine_name(engine);
2381
 
  result= (unsigned char *) session->strmake(engine_name->str, engine_name->length);
 
2380
  engine_name= engine->get_name();
 
2381
  result= (unsigned char *) session->strmake(engine_name.c_str(),
 
2382
                                             engine_name.size());
2382
2383
  return result;
2383
2384
}
2384
2385