This patch is based on
from https://github.com/webscalesql/webscalesql-5.6
patch a49907fc6

Fix errors detected by ASan at compile time