Commit 150b9a5f authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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

into  trift2.:/MySQL/M41/push-4.1
parents ac5309cb 57dd7bc8

libmysqld/ha_blackhole.cc

deleted100755 → 0
+0 −0

Empty file deleted.

scripts/mysql_config.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"`