summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-08-01 16:25:48 +0200
committerunknown <jonas@perch.ndb.mysql.com>2006-08-01 16:25:48 +0200
commit8509c31abb2b0b34293f12ad90a95c22c43a3abc (patch)
tree46bf092a20988b6bce7836b5936323247df36d21 /ndb
parent340053df4ed7215517de0a67fd5e79bee5251d38 (diff)
parent31e3e753042bf6e51fc26d38fa5eb6794e7ebccd (diff)
downloadmariadb-git-8509c31abb2b0b34293f12ad90a95c22c43a3abc.tar.gz
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhMain.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 42e38b41b4b..e4289715c38 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -12508,6 +12508,20 @@ void Dblqh::lastWriteInFileLab(Signal* signal)
void Dblqh::writePageZeroLab(Signal* signal)
{
+ if (logPartPtr.p->logPartState == LogPartRecord::FILE_CHANGE_PROBLEM)
+ {
+ if (logPartPtr.p->firstLogQueue == RNIL)
+ {
+ jam();
+ logPartPtr.p->logPartState = LogPartRecord::IDLE;
+ }
+ else
+ {
+ jam();
+ logPartPtr.p->logPartState = LogPartRecord::ACTIVE;
+ }
+ }
+
logFilePtr.p->fileChangeState = LogFileRecord::NOT_ONGOING;
/*---------------------------------------------------------------------------*/
/* IT COULD HAVE ARRIVED PAGE WRITES TO THE CURRENT FILE WHILE WE WERE */