From a21f8a0e57a3d0eabf24ac8f4fccb6f563ecc3b1 Mon Sep 17 00:00:00 2001
From: "kent.boortz@sun.com" <>
Date: Thu, 6 Nov 2008 19:38:19 +0100
Subject: Back merges from 6.0.8 - Removed some copy/paste between debug and
 normal build in RPM spec - Removed "mysql_upgrade_shell" from RPM build -
 Removed use of "grep -q" in "configure.in", not portable - Improved test to
 disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
---
 config/ac-macros/ha_ndbcluster.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index 9df96a7750b..5ee136f2266 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -280,7 +280,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
   esac
 
   # libndbclient versioning when linked with GNU ld.
-  if $LD --version 2>/dev/null|grep -q GNU; then
+  if $LD --version 2>/dev/null|grep GNU >/dev/null 2>&1 ; then
     NDB_LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/storage/ndb/src/libndb.ver"
     AC_CONFIG_FILES(storage/ndb/src/libndb.ver)
   fi
-- 
cgit v1.2.1