diff options
| author | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
|---|---|---|
| committer | unknown <lars@mysql.com> | 2005-05-09 11:45:59 +0200 |
| commit | 14b614e16414acc996a932c73f3d0a8e4e83538a (patch) | |
| tree | 075608ca4d88921bffb8479717d99dadb29f3770 /storage/ndb/src/kernel/blocks/ndbfs | |
| parent | 383c19a0442f914b18e5f146f5adfa78359ec5f2 (diff) | |
| parent | 848611b5ed1e565d02eea896e22753b818c458c5 (diff) | |
| download | mariadb-git-14b614e16414acc996a932c73f3d0a8e4e83538a.tar.gz | |
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/compile-dist:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
Diffstat (limited to 'storage/ndb/src/kernel/blocks/ndbfs')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp index f76440a462a..b3fc6e04d6c 100644 --- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp +++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp @@ -799,7 +799,11 @@ 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", |