by Layne Heiny.
I tried the 1.9+ to 2.2 several different times (different settings of memory_limit and optimizing tables/truncating tables). All fail.
I uploaded the 2.1 files last night and plan to do the upgrade in a few minutes.