← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 09:33:49 UTC
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329093349-oz4cgb9f7l1032m3
Fix Drizzle to compile in GCC 4.6 (which fires warnings and therefore errors if a variable is set and not read)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
1619
1619
 
1620
1620
void sys_var_session_storage_engine::set_default(Session *session, sql_var_t type)
1621
1621
{
1622
 
  plugin::StorageEngine *old_value, *new_value, **value;
 
1622
  plugin::StorageEngine *new_value, **value;
1623
1623
  if (type == OPT_GLOBAL)
1624
1624
  {
1625
1625
    value= &(global_system_variables.*offset);
1631
1631
    new_value= global_system_variables.*offset;
1632
1632
  }
1633
1633
  assert(new_value);
1634
 
  old_value= *value;
1635
1634
  *value= new_value;
1636
1635
}
1637
1636