summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas@perch.ndb.mysql.com <>2006-03-13 14:43:07 +0100
committerjonas@perch.ndb.mysql.com <>2006-03-13 14:43:07 +0100
commit754989c6026a0e44e3fb9dda07d5a8ee703ba535 (patch)
treec03b66e6fdd21e388a2fdd180d2e1aed748bab39
parentac287ad34d4062af77a40d08513ac3c932303f1f (diff)
parent121b8d37643928f31aadd5fba956fefdc81c2b83 (diff)
downloadmariadb-git-754989c6026a0e44e3fb9dda07d5a8ee703ba535.tar.gz
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
-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 08987fa9420..0bc56e51c4f 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;