recompose this grid

testing results for: sql
mac-mini
Cla-Dar-i64
sql/test/BugTracker-200978.896 
segfault_when_quitting_debugger.SF-2538837 X O0.390 
70130 (Nov2019)