Merge trift2.:/MySQL/M41/mysql-4.1

into trift2.:/MySQL/M41/push-4.1

Merge trift2.:/MySQL/M41/mysql-4.1
into trift2.:/MySQL/M41/push-4.1
150b9a5f · joerg@trift2 · ac5309cb · 57dd7bc8 · ac5309cb · 150b9a5f
Commit 150b9a5f authored Sep 04, 2007 by joerg@trift2
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

libmysqld/ha_blackhole.cc libmysqld/ha_blackhole.cc +0 -0

scripts/mysql_config.sh scripts/mysql_config.sh +1 -1

No files found.
--- a/libmysqld/ha_blackhole.cc
+++ b/libmysqld/ha_blackhole.cc
--- 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"`