mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
This commit is contained in:
commit
ddfd522c8a
2 changed files with 10 additions and 1 deletions
|
@ -99,6 +99,7 @@ AsyncFile::AsyncFile(SimulatedBlock& fs) :
|
|||
{
|
||||
m_page_ptr.setNull();
|
||||
m_current_request= m_last_request= 0;
|
||||
m_open_flags = 0;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -328,6 +329,7 @@ void AsyncFile::openReq(Request* request)
|
|||
{
|
||||
m_auto_sync_freq = 0;
|
||||
m_write_wo_sync = 0;
|
||||
m_open_flags = request->par.open.flags;
|
||||
|
||||
// for open.flags, see signal FSOPENREQ
|
||||
#ifdef NDB_WIN32
|
||||
|
@ -954,7 +956,12 @@ AsyncFile::writevReq( Request * request)
|
|||
void
|
||||
AsyncFile::closeReq(Request * request)
|
||||
{
|
||||
if (m_open_flags & (
|
||||
FsOpenReq::OM_WRITEONLY |
|
||||
FsOpenReq::OM_READWRITE |
|
||||
FsOpenReq::OM_APPEND )) {
|
||||
syncReq(request);
|
||||
}
|
||||
#ifdef NDB_WIN32
|
||||
if(!CloseHandle(hFile)) {
|
||||
request->error = GetLastError();
|
||||
|
|
|
@ -225,6 +225,8 @@ private:
|
|||
int theFd;
|
||||
#endif
|
||||
|
||||
Uint32 m_open_flags; // OM_ flags from request to open file
|
||||
|
||||
MemoryChannel<Request> *theReportTo;
|
||||
MemoryChannel<Request>* theMemoryChannelPtr;
|
||||
|
||||
|
|
Loading…
Reference in a new issue