Import/Merge of libtest latest.

[m6w6/libmemcached] / libtest / has.cc

diff --git a/libtest/has.cc b/libtest/has.cc
index 72441819552e24315858192afe3d81e67f9d2918..ba4bbfc65efd6af1aa31db34f11c9b3141bfee99 100644 (file)
--- a/libtest/has.cc
+++ b/libtest/has.cc
@@ -113,15 +113,13 @@ bool has_drizzled()
 
 bool has_mysqld()
 {
-#if defined(HAVE_MYSQL_BUILD) && HAVE_MYSQL_BUILD
-  if (HAVE_MYSQL_BUILD)
+  if (HAVE_MYSQLD_BUILD)
   {
-    if (access(HAVE_MYSQL, X_OK) == 0)
+    if (access(MYSQLD_BINARY, X_OK) == 0)
     {
       return true;
     }
   }
-#endif
 
   return false;
 }