recompose this grid

testing results for: sql
lab05
GNU-Fed-i64
sql/test/BugTracker-200970.575 
segfault_when_quitting_debugger.SF-2538837 X O0.293 
70219 (default)