recompose this grid

testing results for: sql
win2k12r2
Int-Win-i64
sql/test/BugTracker-201454.281 
aggregates-intervals.Bug-3533 X O0.516 
71697 (default)