[Maria-developers] merge for MySQL56 FSP data types