← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/transaction_services.cc

  • Committer: Jay Pipes
  • Date: 2010-04-08 16:27:25 UTC
  • mfrom: (1405.6.10 replication-pairs)
  • mto: This revision was merged to the branch mainline in revision 1457.
  • Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/transaction_services.cc
882
882
  return error;
883
883
}
884
884
 
885
 
inline bool TransactionServices::shouldConstructMessages()
 
885
bool TransactionServices::shouldConstructMessages()
886
886
{
887
887
  ReplicationServices &replication_services= ReplicationServices::singleton();
888
888
  return replication_services.isActive();
913
913
{
914
914
  message::TransactionContext *trx= in_transaction.mutable_transaction_context();
915
915
  trx->set_server_id(in_session->getServerId());
916
 
  trx->set_transaction_id(in_session->getQueryId());
 
916
  trx->set_transaction_id(getNextTransactionId());
917
917
  trx->set_start_timestamp(in_session->getCurrentTimestamp());
918
918
}
919
919