merge 5.7 innodb and xtradb

Description

merge 5.7 innodb and xtradb, preferably both at the same time.

Environment

None

Status

Assignee

Jan Lindström

Reporter

Sergei Golubchik

Labels

None

External issue ID

None

External issue ID

None

Time tracking

480h

Sprint

None

Fix versions

Priority

Major