Backport a fix from "trunk" into 5.5.1 which came after cloning only. Original comment:
Backport a fix from "trunk" into 5.5.1 which came after cloning only.
Original comment:

revno: 2930
| revision-id: alik@sun.com-20091223120351-m6l2t721tvtsiumu
| parent: alik@sun.com-20091223104155-cq3uw9l2yvg6jmgc
| committer: Alexander Nozdrin <alik@sun.com>
| branch nick: mysql-trunk-bugfixing
| timestamp: Wed 2009-12-23 15:03:51 +0300
| message:
|   Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
|   into mysql-trunk-bugfixing.
| 
|   Original revision:
|   ------------------------------------------------------------
|     revision-id: vvaintroub@mysql.com-20091222115311-bam0xorumd8gvjyo
|     parent: mattias.jonsson@sun.com-20091221104426-x2e6c93x8iik4fo0
|     committer: Vladislav Vaintroub <vvaintroub@mysql.com>
|     branch nick: mysql-next-mr-bugfixing
|     timestamp: Tue 2009-12-22 12:53:11 +0100
|     message:
|       Bug#49834 - fixed a bug introduced by mismerge.
|   	restore original innobase version


davidl-zend/zenddbi,natsys/mariadb_10.2,davidl-zend/zenddbi,flynn1973/mariadb-aix,natsys/mariadb_10.2,natsys/mariadb_10.2,davidl-zend/zenddbi,flynn1973/mariadb-aix,slanterns/server,flynn1973/mariadb-aix,natsys/mariadb_10.2,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,natsys/mariadb_10.2,ollie314/server,natsys/mariadb_10.2,flynn1973/mariadb-aix,natsys/mariadb_10.2,natsys/mariadb_10.2,natsys/mariadb_10.2,ollie314/server,ollie314/server,davidl-zend/zenddbi,ollie314/server,natsys/mariadb_10.2,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,davidl-zend/zenddbi,flynn1973/mariadb-aix,ollie314/server,flynn1973/mariadb-aix,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,ollie314/server,flynn1973/mariadb-aix