Also, merge some test changes from MySQL 5.7.10, for deprecating innodb_support_xa.
Attach a file by drag & drop or click to upload
