diff options
| author | jonas@perch.ndb.mysql.com <> | 2007-05-17 08:57:03 +0200 |
|---|---|---|
| committer | jonas@perch.ndb.mysql.com <> | 2007-05-17 08:57:03 +0200 |
| commit | 0161ba4893e0aeb031a82adef55be1b971d132a2 (patch) | |
| tree | 74ac85da23b7005334c412b2f272fa5197f5f77d | |
| parent | 7d79641e4bc7c751f4e96e6aa467ff0b175ceafc (diff) | |
| parent | 1aec91bd1c4b5787f5df63c351526c3c0a46e292 (diff) | |
| download | mariadb-git-0161ba4893e0aeb031a82adef55be1b971d132a2.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
| -rw-r--r-- | storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp index 4b2926d4981..6a1ad48f8b7 100644 --- a/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp @@ -5200,9 +5200,9 @@ void Dbacc::execEXPANDCHECK2(Signal* signal) { jamEntry(); - if(refToBlock(signal->getSendersBlockRef()) == DBLQH){ + if(refToBlock(signal->getSendersBlockRef()) == DBLQH) + { jam(); - reenable_expand_after_redo_log_exection_complete(signal); return; } |