Addresses #1040 Moved a couple of functions out of the critical path for the common case (only needed for uncommon case)
Addresses #1040
Moved a couple of functions out of the critical path for the common case (only needed for uncommon case)

git-svn-id: 4b2652e19d8125fd9d24eff55f31fd1beb5a42e7@5298 c7de825b-a66e-492c-adef-691d508d4ae1

natsys/mariadb_10.2,ollie314/server,flynn1973/mariadb-aix,ollie314/server,ollie314/server,natsys/mariadb_10.2,ollie314/server,natsys/mariadb_10.2,flynn1973/mariadb-aix,ottok/PerconaFT,davidl-zend/zenddbi,natsys/mariadb_10.2,ottok/PerconaFT,natsys/mariadb_10.2,davidl-zend/zenddbi,percona/PerconaFT,davidl-zend/zenddbi,kuszmaul/PerconaFT-tmp,ottok/PerconaFT,slanterns/server,percona/PerconaFT,kuszmaul/PerconaFT-tmp,flynn1973/mariadb-aix,natsys/mariadb_10.2,BohuTANG/ft-index,natsys/mariadb_10.2,ollie314/server,natsys/mariadb_10.2,flynn1973/mariadb-aix,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,davidl-zend/zenddbi,BohuTANG/ft-index,flynn1973/mariadb-aix,davidl-zend/zenddbi,flynn1973/mariadb-aix,flynn1973/mariadb-aix,ollie314/server,kuszmaul/PerconaFT-tmp,davidl-zend/zenddbi,davidl-zend/zenddbi,ollie314/server,davidl-zend/zenddbi,ollie314/server,percona/PerconaFT,kuszmaul/PerconaFT,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,flynn1973/mariadb-aix,percona/PerconaFT,ollie314/server,kuszmaul/PerconaFT,ottok/PerconaFT,kuszmaul/PerconaFT-tmp,kuszmaul/PerconaFT,kuszmaul/PerconaFT,davidl-zend/zenddbi,BohuTANG/ft-index,natsys/mariadb_10.2,BohuTANG/ft-index,natsys/mariadb_10.2,flynn1973/mariadb-aix