Improve alignment fix and backport small code change from MySQL 8.0.32 codebase to fix build for i386. Fixes: d06e12de