Merge

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-errmsg.txt~31abf77f9e7b9211:
  Auto merged
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged

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)

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"){

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",

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"