diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-06-28 08:47:43 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-06-28 08:47:43 +0200 |
| commit | aef2cdd2edbabba4fe3b8393a97b996c42281db5 (patch) | |
| tree | 425363a78e0bb34c38a1ef63da566e80b05ab329 /storage/ndb/src/kernel/blocks/suma | |
| parent | 0ec6bb3f00bd390dcbd8ea2f634ac6ff6b19c9e6 (diff) | |
| parent | a063057704c547097cf20803bd0aa661723d6c2b (diff) | |
| download | mariadb-git-aef2cdd2edbabba4fe3b8393a97b996c42281db5.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
SCCS merged
Diffstat (limited to 'storage/ndb/src/kernel/blocks/suma')
| -rw-r--r-- | storage/ndb/src/kernel/blocks/suma/Suma.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp index 686ae476879..42666a9e5d9 100644 --- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp +++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp @@ -2480,7 +2480,8 @@ Suma::execSUB_STOP_REQ(Signal* signal){ TablePtr tabPtr; tabPtr.i = subPtr.p->m_table_ptrI; - if (!(tabPtr.p = c_tables.getPtr(tabPtr.i)) || + if (tabPtr.i == RNIL || + !(tabPtr.p = c_tables.getPtr(tabPtr.i)) || tabPtr.p->m_tableId != subPtr.p->m_tableId) { jam(); |