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

into trift2.:/MySQL/M41/push-4.1
2007-09-04 19:37:45 +02:00 · 2007-09-04 19:37:45 +02:00 · 150b9a5f20
commit 150b9a5f20
parent ac5309cb04 57dd7bc875
2 changed files with 1 additions and 1 deletions
--- 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"`