← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_stats/logging_stats.cc

  • Committer: Lee Bieber
  • Date: 2010-11-15 04:50:59 UTC
  • mfrom: (1931.1.2 build)
  • Revision ID: kalebral@gmail.com-20101115045059-syjxk4sjrwmkz2sf
Merge Andrew - fix bug 674381: global_status test failure
Merge Monty - fix bug 669635: Boolean options in config file require a value while command line does not 
Merge Monty- fix bug #669707: Crash from boost::condition_variable assert fail when datadir is not full path

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_stats/logging_stats.cc
140
140
bool LoggingStats::resetGlobalScoreboard()
141
141
{
142
142
  cumulative_stats->getGlobalStatusVars()->reset();
 
143
  cumulative_stats->getGlobalStats()->getUserCommands()->reset();
143
144
 
144
 
  vector<vector<ScoreboardSlot* >* > *vector_of_scoreboard_vectors=
 
145
  ScoreBoardVectors *vector_of_scoreboard_vectors=
145
146
    current_scoreboard->getVectorOfScoreboardVectors();
146
147
 
147
 
  vector<vector<ScoreboardSlot* >* >::iterator v_of_scoreboard_v_begin_it= vector_of_scoreboard_vectors->begin();
 
148
  ScoreBoardVectors::iterator v_of_scoreboard_v_begin_it= vector_of_scoreboard_vectors->begin();
148
149
 
149
 
  vector<vector<ScoreboardSlot* >* >::iterator v_of_scoreboard_v_end_it= vector_of_scoreboard_vectors->end();
 
150
  ScoreBoardVectors::iterator v_of_scoreboard_v_end_it= vector_of_scoreboard_vectors->end();
150
151
 
151
152
  for (; v_of_scoreboard_v_begin_it != v_of_scoreboard_v_end_it; ++v_of_scoreboard_v_begin_it)
152
153
  {
157
158
    for (; scoreboard_vector_it != scoreboard_vector_end; ++scoreboard_vector_it)
158
159
    {
159
160
      ScoreboardSlot *scoreboard_slot= *scoreboard_vector_it;
160
 
      if (scoreboard_slot->isInUse())
161
 
      {
162
 
        scoreboard_slot->getStatusVars()->reset();
163
 
      }
 
161
      scoreboard_slot->getStatusVars()->reset();
 
162
      scoreboard_slot->getUserCommands()->reset();
164
163
    }
165
164
  }
166
165