recordonly commit to fix earlier merge without -x
* fix win32,win64 parts, fixes #40439. All records to under pshpack4 in header.

(cherry picked from commit e084d3259f6d2be22735615ffe53c49c4e76f2a6)