Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).