← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log_index.cc

Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/transaction_log/transaction_log_index.cc
112
112
 
113
113
uint64_t TransactionLogIndex::getNumTransactionEntries() const
114
114
{
115
 
  return num_transaction_entries;
 
115
  return transaction_entries.size();
116
116
}
117
117
 
118
118
TransactionLog::Entries &TransactionLogIndex::getEntries()
137
137
    min_end_timestamp= transaction.transaction_context().end_timestamp();
138
138
  }
139
139
  num_log_entries++;
140
 
  num_transaction_entries++;
141
140
  max_transaction_id= transaction.transaction_context().transaction_id();
142
141
  max_end_timestamp= transaction.transaction_context().end_timestamp();
143
142
  entries.push_back(entry);