recompose this grid

testing results for: sql
lab05
GNU-Fed-i64
sql/test/BugTracker-201426.292 
aggregates-intervals.Bug-3533 X O0.304 
71697 (default)