bzr commit into mysql-5.1 branch (jonas:2704)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/

 2704 Jonas Oreland	2008-10-21
      ndb - enable directio on solaris
modified:
  configure.in
  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

=== modified file 'configure.in'
--- a/configure.in	2008-10-21 10:18:45 +0000
+++ b/configure.in	2008-10-21 12:52:50 +0000
@@ -2058,7 +2058,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bs
   sighold sigset sigthreadmask port_create sleep \
   snprintf socket stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \
   strtol strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr \
-  posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd)
+  posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd directio)
 
 #
 #

=== modified file 'storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp'
--- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2008-10-21 12:45:36 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2008-10-21 12:52:50 +0000
@@ -615,8 +615,15 @@ no_odirect:
     
     if (request->error)
       return;
+#elif defined HAVE_DIRECTIO && defined(DIRECTIO_ON)
+    if (directio(theFd, DIRECTIO_ON) == -1)
+    {
+      ndbout_c("%s Failed to set DIRECTIO_ON errno: %u",
+               theFileName.c_str(), errno);
+    }
 #endif
   }
+
 #ifdef VM_TRACE
   if (flags & FsOpenReq::OM_DIRECT)
   {