← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.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/transaction_services.cc
999
999
     * for this Session object.  Session is responsible for
1000
1000
     * deleting transaction message when done with it.
1001
1001
     */
1002
 
    transaction= new (nothrow) message::Transaction();
 
1002
    transaction= new message::Transaction();
1003
1003
    initTransactionMessage(*transaction, session, should_inc_trx_id);
1004
1004
    session.setTransactionMessage(transaction);
1005
 
    return transaction;
1006
1005
  }
1007
 
  else
1008
 
    return transaction;
 
1006
  return transaction;
1009
1007
}
1010
1008
 
1011
1009
void TransactionServices::initTransactionMessage(message::Transaction &transaction,
2154
2152
  if (! replication_services.isActive())
2155
2153
    return 0;
2156
2154
 
2157
 
  message::Transaction *transaction= new (nothrow) message::Transaction();
 
2155
  message::Transaction *transaction= new message::Transaction();
2158
2156
 
2159
2157
  // set server id, start timestamp
2160
2158
  initTransactionMessage(*transaction, session, true);