Merge pull request #975 from Oldiesmann/release-2.1

! TYPE=HEAP => ENGINE=MEMORY, since we're not going to support MySQL 4.0...