diff options
| author | unknown <joerg@trift2.> | 2007-09-04 19:37:45 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-09-04 19:37:45 +0200 |
| commit | 5c02bcbad9deac0400b3a730a5300b7f4cc5f47e (patch) | |
| tree | 9ce3b7a8f5a93af0a0369a6c976c306bcdbe438e | |
| parent | 10012b36feb18180892201b4afdd995e9e0f1a0a (diff) | |
| parent | f3b2c398795b31be94b899edc59034632fdc5155 (diff) | |
| download | mariadb-git-5c02bcbad9deac0400b3a730a5300b7f4cc5f47e.tar.gz | |
Merge trift2.:/MySQL/M41/mysql-4.1
into trift2.:/MySQL/M41/push-4.1
| -rwxr-xr-x | libmysqld/ha_blackhole.cc | 0 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
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"` |