diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | ndb/src/cw/cpcd/Process.cpp | 5 | ||||
| -rw-r--r-- | ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 4 | ||||
| -rw-r--r-- | sql/ha_blackhole.cc | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 01726f15985..311403f93e6 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -181,6 +181,7 @@ mwagner@cash.mwagner.org mwagner@evoq.mwagner.org mwagner@here.mwagner.org mwagner@mysql.com +mwagner@ultrafly.mysql.com mwagner@work.mysql.com mydev@mysql.com mysql@home.(none) diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp index 2509f34e882..b0ebbadb017 100644 --- a/ndb/src/cw/cpcd/Process.cpp +++ b/ndb/src/cw/cpcd/Process.cpp @@ -220,8 +220,11 @@ set_ulimit(const BaseString & pair){ if(!(list[1].trim() == "unlimited")){ value = atoi(list[1].c_str()); } - +#if defined(__INTEL_COMPILER) + struct rlimit64 rlp; +#else struct rlimit rlp; +#endif #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res = setrlimit(x, &rlp); }} if(list[0].trim() == "c"){ diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp index f76440a462a..b3fc6e04d6c 100644 --- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp +++ b/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", diff --git a/sql/ha_blackhole.cc b/sql/ha_blackhole.cc index 5467ab8a978..c5062c4ea81 100644 --- a/sql/ha_blackhole.cc +++ b/sql/ha_blackhole.cc @@ -19,7 +19,7 @@ #pragma implementation // gcc: Class implementation #endif -#include <mysql_priv.h> +#include "mysql_priv.h" #ifdef HAVE_BLACKHOLE_DB #include "ha_blackhole.h" |