summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <jonas@perch.ndb.mysql.com>2006-03-13 14:40:32 +0100
committerunknown <jonas@perch.ndb.mysql.com>2006-03-13 14:40:32 +0100
commit7b3b008b5736605de6f049e9c826e09ec446a64b (patch)
tree42f64a874fd9dac8d2a1e7f394da23c1e0f9d9a1 /ndb
parent38b40482f7e4b6b94c2bbab6bca25399957a326b (diff)
parentfc782fa7495abdf6fbad52fd09eea4dc6e68686f (diff)
downloadmariadb-git-7b3b008b5736605de6f049e9c826e09ec446a64b.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/suma/Suma.hpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/ndb/src/kernel/blocks/suma/Suma.hpp b/ndb/src/kernel/blocks/suma/Suma.hpp
index 0638bd4a006..3508c5b0e0f 100644
--- a/ndb/src/kernel/blocks/suma/Suma.hpp
+++ b/ndb/src/kernel/blocks/suma/Suma.hpp
@@ -241,7 +241,8 @@ public:
void runDROP_TRIG_REF(Signal* signal);
void runDropTrig(Signal* signal, Uint32 triggerId, Uint32 tableId);
- union { Uint32 nextPool; Uint32 nextList; Uint32 ptrI; };
+ Uint32 ptrI;
+ union { Uint32 nextPool; Uint32 nextList; };
};
friend struct SyncRecord;