recompose this grid

testing results for: sql
lab01
Int-Fed-i64
sql/test/emptydb-upgrade-chain25.581 
check X O22.688 
sql/test/emptydb-upgrade-chain-hge25.439 
check X O22.496 
76951 (octbugs)