Changes to mainline MySQL additional types.