Backporting fix for Bug#49834 from mysql-next-mr-bugfixing into mysql-trunk-bugfixing.
Backporting fix for Bug#49834 from mysql-next-mr-bugfixing
into mysql-trunk-bugfixing.

Original revision:
------------------------------------------------------------
revision-id: 4e3dde492713d125c9a41aa0052be8d84dfa8f81@mysql.com-20091222115311-bam0xorumd8gvjyo
parent: f9afe53c916ec0902408c826096d9668e14371e2@sun.com-20091221104426-x2e6c93x8iik4fo0
committer: Vladislav Vaintroub <4e3dde492713d125c9a41aa0052be8d84dfa8f81@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
------------------------------------------------------------

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