The merge only covered 10.1 up to
commit 4d248974.

Actually merge the changes up to
commit 0a534348.

Also, remove the unused InnoDB field trx_t::abort_type.