summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlibmysqld/ha_blackhole.cc0
-rw-r--r--scripts/mysql_config.sh2
2 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/ha_blackhole.cc b/libmysqld/ha_blackhole.cc
deleted file mode 100755
index e69de29bb2d..00000000000
--- a/libmysqld/ha_blackhole.cc
+++ /dev/null
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
index 1fcad16affb..addc3a10474 100644
--- a/scripts/mysql_config.sh
+++ b/scripts/mysql_config.sh
@@ -122,7 +122,7 @@ done
cflags=`echo "$cflags"|sed -e 's/ *\$//'`
# Same for --libs(_r)
-for remove in lmtmalloc static-libcxa i-static
+for remove in lmtmalloc static-libcxa i-static static-intel
do
# We know the strings starts with a space
libs=`echo "$libs"|sed -e "s/ -$remove */ /g"`