2 Commits

Author	SHA1	Message	Date
Sergei Golubchik	9b1824dcd2	Merge branch '10.1' into 10.2	2018-05-10 13:01:42 +02:00
Marko Mäkelä	7b9486d2eb	MDEV-14693 XA: Assertion `!clust_index->online_log' failed in rollback_inplace_alter_table ... ha_innobase::commit_inplace_alter_table(): Defer the freeing of ctx->trx until after the operation has been successfully committed. In this way, rollback on a partitioned table will be possible. rollback_inplace_alter_table(): Handle ctx->new_table == NULL when ctx->trx != NULL.	2018-05-07 12:05:20 +03:00