Did  {{{ svn merge -r3229:3230 https://svn.tokutek.com/tokudb/tokudb.558 }}} and resolved the conflicts.  Now I'll get rid of the 558 branch again. Addresses #558.
Did 
{{{
svn merge -r3229:3230 https://svn.tokutek.com/tokudb/tokudb.558
}}}
and resolved the conflicts.  Now I'll get rid of the 558 branch again.
Addresses #558.


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


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