svn merge https://svn.tokutek.com/tokudb/mysql.com/mysql-5.5.30-6372b https://svn.tokutek.com/tokudb/mysql.com/mysql-5.5.30
svn merge https://svn.tokutek.com/tokudb/mysql.com/mariadb-5.5.30-6372b https://svn.tokutek.com/tokudb/mysql.com/mariadb-5.5.30
svn merge https://svn.tokutek.com/tokudb/mysql/tokudb-engine/tokudb-engine-6372b https://svn.tokutek.com/tokudb/mysql/tokudb-engine/tokudb-engine


git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@55264 c7de825b-a66e-492c-adef-691d508d4ae1