r1352 + fix upgrade for MySQL-4