← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Monty Taylor
  • Date: 2009-04-01 05:44:56 UTC
  • mto: (971.1.10 mordred)
  • mto: This revision was merged to the branch mainline in revision 978.
  • Revision ID: mordred@inaugust.com-20090401054456-7uo148bhub9mygvs
First steps towards new plugin reg.

Show diffs side-by-side

added added

removed removed

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