← 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-03-24 18:13:47 UTC
  • mto: (960.5.2 mordred)
  • mto: This revision was merged to the branch mainline in revision 964.
  • Revision ID: mordred@inaugust.com-20090324181347-phblgoj913uph2hs
Rename hton to engine.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
2342
2342
  if (var->value->result_type() == STRING_RESULT)
2343
2343
  {
2344
2344
    LEX_STRING engine_name;
2345
 
    StorageEngine *hton;
 
2345
    StorageEngine *engine;
2346
2346
    if (!(res=var->value->val_str(&str)) ||
2347
2347
        !(engine_name.str= (char *)res->ptr()) ||
2348
2348
        !(engine_name.length= res->length()) ||
2349
2349
        !(var->save_result.plugin= ha_resolve_by_name(session, &engine_name)) ||
2350
 
        !(hton= plugin_data(var->save_result.plugin, StorageEngine *)))
 
2350
        !(engine= plugin_data(var->save_result.plugin, StorageEngine *)))
2351
2351
    {
2352
2352
      value= res ? res->c_ptr() : "NULL";
2353
2353
      goto err;
2367
2367
                                                         const LEX_STRING *)
2368
2368
{
2369
2369
  unsigned char* result;
2370
 
  StorageEngine *hton;
 
2370
  StorageEngine *engine;
2371
2371
  LEX_STRING *engine_name;
2372
2372
  plugin_ref plugin= session->variables.*offset;
2373
2373
  if (type == OPT_GLOBAL)
2374
2374
    plugin= my_plugin_lock(session, &(global_system_variables.*offset));
2375
 
  hton= plugin_data(plugin, StorageEngine*);
2376
 
  engine_name= ha_storage_engine_name(hton);
 
2375
  engine= plugin_data(plugin, StorageEngine*);
 
2376
  engine_name= ha_storage_engine_name(engine);
2377
2377
  result= (unsigned char *) session->strmake(engine_name->str, engine_name->length);
2378
2378
  if (type == OPT_GLOBAL)
2379
2379
    plugin_unlock(session, plugin);