diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-01-11 11:35:25 +0100 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-01-11 11:35:25 +0100 |
| commit | 641ce5e97e64fc89e497ee903bca03bef9476665 (patch) | |
| tree | 42bd34e581072a3b8da2e30ed6fdbd85b4079395 /storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | |
| parent | 2c0f53d69ceba4f3db98afba47bfb73b3b83525d (diff) | |
| download | mariadb-git-641ce5e97e64fc89e497ee903bca03bef9476665.tar.gz | |
wl2723 - ndb opt. nr
mysql-test/t/rpl_multi_engine.test:
merge fix
libmysqld/sql_tablespace.cc:
New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
Diffstat (limited to 'storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp index 75ab83b2e98..6947a4902a1 100644 --- a/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp +++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp @@ -341,12 +341,14 @@ void AsyncFile::openReq(Request* request) #endif } +#ifndef NDB_NO_O_DIRECT /* to allow tmpfs */ #ifdef O_DIRECT if (flags & FsOpenReq::OM_DIRECT) { new_flags |= O_DIRECT; } #endif +#endif switch(flags & 0x3){ case FsOpenReq::OM_READONLY: |