WIP:Xtradb

Taking a first stab at merging Mike's xtradb work into this tree.

Will re-arrange stuff a bit in follow-up commits.