Merge zizzer:/bk/m5 into zower.eecs.umich.edu:/z/hsul/bk/realclean

--HG--
extra : convert_revision : 32bbe481ee748785f0bcffb0a711017d51c987a0

base/statistics.cc

@@ -265,12 +265,19 @@ Database::check()
 void
 Database::reset()
 {
+    list<GenBin *>::iterator bi = bins.begin();
+    list<GenBin *>::iterator be = bins.end();
     list_t::iterator i = allStats.begin();
     list_t::iterator end = allStats.end();
 
-    while (i != end) {
+   while (bi != be) {
+       (*bi)->activate();
+
+       while (i != end) {
         (*i)->reset();
         ++i;
+       }
+       ++bi;
     }
 }