recompose this grid

testing results for: sql
win2k12r2
Mic-Win-i32
sql/test/BugTracker-20207.281 
wrong-key-error.Bug-6983 O X0.031 
78337 (default)