recompose this grid

testing results for: sql
mac-mini
Cla-Dar-i64
sql/test/BugTracker-201428.435 
aggregates-intervals.Bug-3533 X O0.316 
71716 (Nov2019)