← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 11:45:17 UTC
  • mfrom: (2318.6.64 rf)
  • Revision ID: me@mark.atwood.name-20110624114517-1mq8no6jlp2nrg7m
merge lp:~olafvdspek/drizzle/refactor15

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
1429
1429
  /* this fails if there is a conflicting variable name. */
1430
1430
  if (system_variable_map.count(lower_name))
1431
1431
  {
1432
 
    errmsg_printf(error::ERROR, _("Variable named %s already exists!\n"),
1433
 
                  var->getName().c_str());
 
1432
    errmsg_printf(error::ERROR, _("Variable named %s already exists!\n"), var->getName().c_str());
1434
1433
    throw exception();
1435
1434
  } 
1436
1435
 
1437
 
  pair<SystemVariableMap::iterator, bool> ret= 
1438
 
    system_variable_map.insert(make_pair(lower_name, var));
 
1436
  pair<SystemVariableMap::iterator, bool> ret= system_variable_map.insert(make_pair(lower_name, var));
1439
1437
  if (ret.second == false)
1440
1438
  {
1441
 
    errmsg_printf(error::ERROR, _("Could not add Variable: %s\n"),
1442
 
                  var->getName().c_str());
 
1439
    errmsg_printf(error::ERROR, _("Could not add Variable: %s\n"), var->getName().c_str());
1443
1440
    throw exception();
1444
1441
  }
1445
1442
}
1542
1539
    errmsg_printf(error::ERROR, _("Failed to initialize system variables"));
1543
1540
    return(1);
1544
1541
  }
1545
 
  return(0);
 
1542
  return 0;
1546
1543
}
1547
1544
 
1548
1545