← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Brian Aker
  • Date: 2011-02-01 20:31:20 UTC
  • mfrom: (2133.1.4 drizzle-build)
  • Revision ID: brian@tangent.org-20110201203120-vmp2abdbjjaua218
Merge in all of the error cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
1523
1523
  /* this fails if there is a conflicting variable name. */
1524
1524
  if (system_variable_map.find(lower_name) != system_variable_map.end())
1525
1525
  {
1526
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Variable named %s already exists!\n"),
 
1526
    errmsg_printf(error::ERROR, _("Variable named %s already exists!\n"),
1527
1527
                  var->getName().c_str());
1528
1528
    throw exception();
1529
1529
  } 
1532
1532
    system_variable_map.insert(make_pair(lower_name, var));
1533
1533
  if (ret.second == false)
1534
1534
  {
1535
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Could not add Variable: %s\n"),
 
1535
    errmsg_printf(error::ERROR, _("Could not add Variable: %s\n"),
1536
1536
                  var->getName().c_str());
1537
1537
    throw exception();
1538
1538
  }
1630
1630
  }
1631
1631
  catch (std::exception&)
1632
1632
  {
1633
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to initialize system variables"));
 
1633
    errmsg_printf(error::ERROR, _("Failed to initialize system variables"));
1634
1634
    return(1);
1635
1635
  }
1636
1636
  return(0);