merge from ~mordred/percona-xtradb/fix-buf-buf, Fixed a compile problem with trying to send a buf_block_t* to a thing wanting