summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <magnus@msdesk.mysql.com>2005-05-19 16:10:34 +0200
committerunknown <magnus@msdesk.mysql.com>2005-05-19 16:10:34 +0200
commitcb6115522623c1cd8e8207865b596dd2a00fc967 (patch)
treee97f54f3ec6897462094c64502ed924e2341303d
parent2f240961727716d77bd15857df2da401529d32f1 (diff)
parent1dfd89e0264768e332cd7413cf19ee35d02bc20b (diff)
downloadmariadb-git-cb6115522623c1cd8e8207865b596dd2a00fc967.tar.gz
Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into msdesk.mysql.com:/home/magnus/mysql-5.0-build
-rw-r--r--ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index b3fc6e04d6c..f76440a462a 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
@@ -799,11 +799,7 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){
request->error = errno;
return;
}
-#if defined(__INTEL_COMPILER)
- struct dirent64 * dp;
-#else
struct dirent * dp;
-#endif
while ((dp = readdir(dirp)) != NULL){
if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0)) {
BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s",