3720 Mikael Ronstrom 2012-01-23
Remove unnecessary eternal while-loop
modified:
storage/ndb/src/kernel/vm/mt.cpp
3719 Mikael Ronstrom 2012-01-23
Merge step 8
modified:
storage/ndb/src/common/transporter/TransporterRegistry.cpp
storage/ndb/src/kernel/blocks/trpman.cpp
storage/ndb/src/kernel/vm/TransporterCallback.cpp
storage/ndb/src/kernel/vm/TransporterCallbackKernel.hpp
storage/ndb/src/kernel/vm/mt.cpp
storage/ndb/src/kernel/vm/mt.hpp
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp revid:mikael.ronstrom@stripped
+++ b/storage/ndb/src/kernel/vm/mt.cpp revid:mikael.ronstrom@stripped
@@ -527,6 +527,7 @@ public:
T *seize(Ndbd_mem_manager *mm, Uint32 rg) {
T *tmp;
Uint32 alloced = 0;
+ bool first = true;
while (1)
{
tmp = m_freelist;
@@ -539,9 +540,15 @@ public:
}
else
{
+ if (!first)
+ {
+ tmp = NULL;
+ break;
+ }
m_freelist = m_global_pool->seize_list(mm, rg, m_alloc_size, &alloced);
m_free = alloced;
}
+ first = false;
}
validate();
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-cluster-7.2 branch (mikael.ronstrom:3719 to 3720) | Mikael Ronstrom | 23 Jan |