Merge Stewart - Fix bug 616466: auto_increment and PBMS problem - adds test case for this, can no longer reproduce the problem Merge Stewart - fix bug 621755: blitzdb dictionary not updated after alter table Merge Stewart - fix bug 668880: remove use of exit in archive storage engine Merge Gustaf - replace macros functions