Those errors happen because you removed the pre-requisite branch. You need to merge both.
On current trunk without these two branches, this:
create temporary table t1 (a int not null auto_increment primary key) /*!40102 engine=MEMORY */;
becomes an InnoDB table when you do bzr tag 7.1.31 because the release_id becomes 7131 which is < 40102. InnoDB result set is then sorted differently from memory engine.
Those errors happen because you removed the pre-requisite branch. You need to merge both.
On current trunk without these two branches, this:
create temporary table t1 (a int not null auto_increment primary key) /*!40102 engine=MEMORY */;
becomes an InnoDB table when you do bzr tag 7.1.31 because the release_id becomes 7131 which is < 40102. InnoDB result set is then sorted differently from memory engine.