← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/set_var.cc

  • Committer: Brian Aker
  • Date: 2009-04-06 16:55:13 UTC
  • mfrom: (970.1.5 merge)
  • Revision ID: brian@tangent.org-20090406165513-0r9u2bo1438u970k
Merge refactoring around plugin_ref

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/set_var.cc
2375
2375
  LEX_STRING *engine_name;
2376
2376
  plugin_ref plugin= session->variables.*offset;
2377
2377
  if (type == OPT_GLOBAL)
2378
 
    plugin= plugin_lock(session, &(global_system_variables.*offset));
 
2378
    plugin= plugin_lock(&(global_system_variables.*offset));
2379
2379
  engine= plugin_data(plugin, StorageEngine*);
2380
2380
  engine_name= ha_storage_engine_name(engine);
2381
2381
  result= (unsigned char *) session->strmake(engine_name->str, engine_name->length);
2394
2394
  else
2395
2395
  {
2396
2396
    value= &(session->variables.*offset);
2397
 
    new_value= plugin_lock(NULL, &(global_system_variables.*offset));
 
2397
    new_value= plugin_lock(&(global_system_variables.*offset));
2398
2398
  }
2399
2399
  assert(new_value);
2400
2400
  old_value= *value;
2410
2410
  old_value= *value;
2411
2411
  if (old_value != var->save_result.plugin)
2412
2412
  {
2413
 
    *value= plugin_lock(NULL, &var->save_result.plugin);
 
2413
    *value= plugin_lock(&var->save_result.plugin);
2414
2414
  }
2415
2415
  return 0;
2416
2416
}