recompose this grid

testing results for: sql
mac-mini
Cla-Dar-i64
sql/test/BugTracker-201510.360 
timestamp_convert.Bug-3815 X O0.018 
73658 (unlock)