recompose this grid

testing results for: sql
power8
GNU-Fed-p64
sql/test/emptydb-upgrade36.068 
check X O32.780 
sql/test/emptydb-upgrade-chain35.481 
check X O32.186 
70121 (candidate-exceptions)