← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Olaf van der Spek
  • Date: 2011-03-23 09:26:52 UTC
  • mto: (2247.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2248.
  • Revision ID: olafvdspek@gmail.com-20110323092652-d3e8lutxy8vu2frb
Remove std::nothrow from new()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
1840
1840
  if (not create_if_not_exists)
1841
1841
    return NULL;
1842
1842
 
1843
 
  user_var_entry *entry= NULL;
1844
 
  entry= new (nothrow) user_var_entry(name.c_str(), query_id);
1845
 
 
1846
 
  if (entry == NULL)
1847
 
    return NULL;
 
1843
  user_var_entry *entry= new user_var_entry(name.c_str(), query_id);
1848
1844
 
1849
1845
  std::pair<UserVars::iterator, bool> returnable= user_vars.insert(make_pair(name, entry));
1850
1846