← Back to branch summary

~linuxjedi/drizzle/trunk-bug-729642

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Lee Bieber
  • Date: 2011-03-01 01:51:22 UTC
  • mfrom: (2209.1.3 build)
  • Revision ID: kalebral@gmail.com-20110301015122-jse47000xs6xp062
Merge Patrick - 726914: Need to update dbqp randgen config files for slave_plugin 
Merge Olaf - fix EOL
Merge Patrick - 725236: randgen transaction log tests need to be implemented using dbqp / randgen

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
1453
1453
            lower_name.begin(), ::tolower);
1454
1454
 
1455
1455
  /* this fails if there is a conflicting variable name. */
1456
 
  if (system_variable_map.find(lower_name) != system_variable_map.end())
 
1456
  if (system_variable_map.count(lower_name))
1457
1457
  {
1458
1458
    errmsg_printf(error::ERROR, _("Variable named %s already exists!\n"),
1459
1459
                  var->getName().c_str());
1590
1590
 
1591
1591
  sys_var *result= NULL;
1592
1592
 
1593
 
  SystemVariableMap::iterator iter= system_variable_map.find(lower_name);
1594
 
  if (iter != system_variable_map.end())
1595
 
  {
1596
 
    result= iter->second;
1597
 
  } 
 
1593
  if (SystemVariableMap::mapped_type* ptr= find_ptr(system_variable_map, lower_name))
 
1594
    result= *ptr;
1598
1595
 
1599
1596
  if (result == NULL)
1600
1597
  {