mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new

Browse source 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
This commit is contained in:
jonas@perch.ndb.mysql.com 2006-03-07 08:06:50 +01:00
commit f1529de522
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
storage/ndb/src/kernel/blocks/lgman.cpp
View file

@ -839,6 +839,7 @@ Lgman::Logfile_group::Logfile_group(const CreateFilegroupImplReq* req)
m_last_lsn = 0;
m_last_synced_lsn = 0;
m_last_sync_req_lsn = 0;
m_max_sync_req_lsn = 0;
m_last_read_lsn = 0;
m_file_pos[0].m_ptr_i= m_file_pos[1].m_ptr_i = RNIL;
@ -1049,8 +1050,11 @@ Logfile_client::sync_lsn(Signal* signal,
wait.p->m_sync_lsn= lsn;
memcpy(&wait.p->m_callback, &req->m_callback,
sizeof(SimulatedBlock::Callback));
}
ptr.p->m_max_sync_req_lsn = lsn > ptr.p->m_max_sync_req_lsn ?
lsn : ptr.p->m_max_sync_req_lsn;
}
if(ptr.p->m_last_sync_req_lsn < lsn &&
! (ptr.p->m_state & Lgman::Logfile_group::LG_FORCE_SYNC_THREAD))
{
@ -1111,16 +1115,16 @@ Lgman::force_log_sync(Signal* signal,
}
Ptr<Lgman::Log_waiter> last;
if(list.last(last) &&
last.p->m_sync_lsn > force_lsn &&
ptr.p->m_last_sync_req_lsn < last.p->m_sync_lsn)
Uint64 max_req_lsn = ptr.p->m_max_sync_req_lsn;
if(max_req_lsn > force_lsn &&
max_req_lsn > ptr.p->m_last_sync_req_lsn)
{
ndbrequire(ptr.p->m_state & Lgman::Logfile_group::LG_FORCE_SYNC_THREAD);
signal->theData[0] = LgmanContinueB::FORCE_LOG_SYNC;
signal->theData[1] = ptr.i;
signal->theData[2] = last.p->m_sync_lsn >> 32;
signal->theData[3] = last.p->m_sync_lsn & 0xFFFFFFFF;
signal->theData[2] = max_req_lsn >> 32;
signal->theData[3] = max_req_lsn & 0xFFFFFFFF;
sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 10, 4);
}
else

5
storage/ndb/src/kernel/blocks/lgman.hpp
View file

@ -183,8 +183,9 @@ public:
Logfile_group::LG_FLUSH_THREAD;
Uint64 m_last_lsn;
Uint64 m_last_sync_req_lsn;
Uint64 m_last_synced_lsn;
Uint64 m_last_sync_req_lsn; // Outstanding
Uint64 m_last_synced_lsn; //
Uint64 m_max_sync_req_lsn; // User requested lsn
union {
Uint64 m_last_read_lsn;
Uint64 m_last_lcp_lsn;