summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2007-01-16 18:59:31 +0100
committerjonas@perch.ndb.mysql.com <>2007-01-16 18:59:31 +0100
commitc4163365a6be81677972080b6cdf4ecc9de4524c (patch)
tree21bb98fdd9d5413adc2cca6a5c42c9ed488ad54f /storage
parent633b32f44314e8d7057dd96e2fd34008ffc1fc44 (diff)
parent045985df4f576d54d50c5224143f2ef318be0ef5 (diff)
downloadmariadb-git-c4163365a6be81677972080b6cdf4ecc9de4524c.tar.gz
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 37c842679ae..3512ba10af3 100644
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
@@ -2831,7 +2831,9 @@ Dbdih::nr_start_fragments(Signal* signal,
return;
}//if
ptrAss(tabPtr, tabRecord);
- if (tabPtr.p->tabStatus != TabRecord::TS_ACTIVE){
+ if (tabPtr.p->tabStatus != TabRecord::TS_ACTIVE ||
+ tabPtr.p->tabStorage != TabRecord::ST_NORMAL)
+ {
jam();
takeOverPtr.p->toCurrentFragid = 0;
takeOverPtr.p->toCurrentTabref++;