bk commit into 5.1 tree (jonas:1.2219) BUG#18295

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2219 06/03/24 09:42:10 jonas@stripped +3 -0
  ndb - bug#18295
    rewrite/clean up code a bit to avoid a gcc4 compiler bug

  storage/ndb/src/kernel/vm/SLList.hpp
    1.7 06/03/24 09:42:07 jonas@stripped +6 -4
    Fix compiler bug

  storage/ndb/src/kernel/vm/DLList.hpp
    1.7 06/03/24 09:42:07 jonas@stripped +6 -4
    Fix compiler bug

  storage/ndb/src/kernel/vm/DLFifoList.hpp
    1.8 06/03/24 09:42:07 jonas@stripped +8 -7
    Fix compiler bug

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new

--- 1.7/storage/ndb/src/kernel/vm/DLFifoList.hpp	2006-02-25 22:12:10 +01:00
+++ 1.8/storage/ndb/src/kernel/vm/DLFifoList.hpp	2006-03-24 09:42:07 +01:00
@@ -312,15 +312,16 @@
 void 
 DLFifoListImpl<P,T,U>::release()
 {
-  Ptr<T> p;
-  while(head.firstItem != RNIL)
+  Ptr<T> ptr;
+  Uint32 curr = head.firstItem;
+  while(curr != RNIL)
   {
-    p.i = head.firstItem;  
-    p.p = thePool.getPtr(head.firstItem);    
-    T * t = p.p;
-    head.firstItem = t->U::nextList;
-    release(p);
+    thePool.getPtr(ptr, curr);
+    curr = ptr.p->U::nextList;
+    thePool.release(ptr);
   }
+  head.firstItem = RNIL;
+  head.lastItem = RNIL;
 }
 
 template <typename P, typename T, typename U>

--- 1.6/storage/ndb/src/kernel/vm/DLList.hpp	2006-03-02 16:44:09 +01:00
+++ 1.7/storage/ndb/src/kernel/vm/DLList.hpp	2006-03-24 09:42:07 +01:00
@@ -332,13 +332,15 @@
 DLListImpl<P,T,U>::release()
 {
   Ptr<T> ptr;
-  while((ptr.i = head.firstItem) != RNIL)
+  Uint32 curr = head.firstItem;
+  while(curr != RNIL)
   {
-    thePool.getPtr(ptr);
-    head.firstItem = ptr.p->U::nextList;
+    thePool.getPtr(ptr, curr);
+    curr = ptr.p->U::nextList;
     thePool.release(ptr);
   }
-}  
+  head.firstItem = RNIL;
+}
 
 template <typename P, typename T, typename U>
 inline

--- 1.6/storage/ndb/src/kernel/vm/SLList.hpp	2006-03-02 16:44:09 +01:00
+++ 1.7/storage/ndb/src/kernel/vm/SLList.hpp	2006-03-24 09:42:07 +01:00
@@ -302,13 +302,15 @@
 SLListImpl<P, T, U>::release()
 {
   Ptr<T> ptr;
-  while((ptr.i = head.firstItem) != RNIL)
+  Uint32 curr = head.firstItem;
+  while(curr != RNIL)
   {
-    thePool.getPtr(ptr);
-    head.firstItem = ptr.p->U::nextList;
+    thePool.getPtr(ptr, curr);
+    curr = ptr.p->U::nextList;
     thePool.release(ptr);
   }
-}  
+  head.firstItem = RNIL;
+}
 
 template <typename P, typename T, typename U>
 inline