Will do. Just a quick note for reference. The first patch is renaming the problematic test() in my_global.h (was also mentioned in #24489) to mysql_test(), which should basically be the same approach taken with the mysql formula (see #23131). Until this issue is resolved upstream. The second patch is cherry-picked from the larger merge, which should land in the upcoming 10.0.7 release (http://bazaar.launchpad.net/~maria-captains/maria/10.0-base/revision/3941#support-files/CMakeLists.txt).