← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/stats_schema.h

  • Committer: lbieber
  • Date: 2010-08-08 05:04:06 UTC
  • mfrom: (1694.2.1 staging)
  • Revision ID: lbieber@orisndriz03-20100808050406-h9b0lzvpwkp3ng2x
 Merge Stewart - recent patch didn't have updated result files for embedded_innodb when the handling of default values was fixed in the table proto
 Merge Joe Daly - use boost::shared_mutex for locking

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/stats_schema.h
114
114
    std::vector<ScoreboardSlot *>::iterator scoreboard_vector_end;
115
115
    std::vector<std::vector<ScoreboardSlot* >* >::iterator vector_of_scoreboard_vectors_it;
116
116
    std::vector<std::vector<ScoreboardSlot* >* >::iterator vector_of_scoreboard_vectors_end; 
117
 
    pthread_rwlock_t* current_lock;
 
117
    boost::shared_mutex* current_lock;
118
118
 
119
119
    void setVectorIteratorsAndLock(uint32_t bucket_number);
120
120
  };