From: magnus.blaudd
Date: June 22 2011 7:21am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4475)
List-Archive: http://lists.mysql.com/commits/139642
Message-Id: <20110622072111.4925E134016@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6351896573131827017=="

--===============6351896573131827017==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4475 magnus.blaudd@stripped	2011-06-22
      ndb
       - remove uneccessary typedef st_ndbcluster_share
       - use NDB_SHARE everywhere

    modified:
      sql/ha_ndb_index_stat.cc
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-06-16 11:36:45 +0000
+++ b/sql/ha_ndb_index_stat.cc	2011-06-22 07:20:42 +0000
@@ -70,7 +70,7 @@ struct Ndb_index_stat {
   int lt_old;     /* for info only */
   struct Ndb_index_stat *list_next;
   struct Ndb_index_stat *list_prev;
-  struct st_ndbcluster_share *share;
+  struct NDB_SHARE *share;
   Ndb_index_stat();
 };
 

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-06-22 07:09:52 +0000
+++ b/sql/ha_ndbcluster.h	2011-06-22 07:20:42 +0000
@@ -191,7 +191,7 @@ enum enum_conflict_cause
 
 /* NdbOperation custom data which points out handler and record. */
 struct Ndb_exceptions_data {
-  struct st_ndbcluster_share *share;
+  struct NDB_SHARE* share;
   const NdbRecord* key_rec;
   const uchar* row;
   enum_conflicting_op_type op_type;
@@ -230,7 +230,7 @@ struct Ndb_statistics {
   Uint64 fragment_extent_free_space;
 };
 
-typedef struct st_ndbcluster_share {
+struct NDB_SHARE {
   NDB_SHARE_STATE state;
   MEM_ROOT mem_root;
   THR_LOCK lock;
@@ -257,7 +257,7 @@ typedef struct st_ndbcluster_share {
   char *old_names; // for rename table
   MY_BITMAP *subscriber_bitmap;
   NdbEventOperation *new_op;
-} NDB_SHARE;
+};
 
 inline
 NDB_SHARE_STATE


--===============6351896573131827017==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   95cc9asxfuf69q1i
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 1cc42b1befa77e5b3939a64e2eff9e425ffd5e03
# timestamp: 2011-06-22 09:21:11 +0200
# source_branch: file:///home/msvensson/mysql/7.0-dusky/
# base_revision_id: magnus.blaudd@stripped\
#   kz22v87bm25melfk
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe0xmZAAAivfgAAQUHP//3ZB
GAC////6UASNPPSg53XLbJqgJKJMGk0wI9JoRminkZGmJAeRDAAAAAAAAAAAJTUCFMNTARtJkwjR
iMRpiMmEkk1NoaaI9TKNNGgaNANGgAAkkE0YpgQU8TBJ6ofpT9KaaDQMSap+X6Y0Z16e5W+5pw4t
UD676RKKTPVGMhqjIYInDRmDi6e5UJJhLfaZuMJ7Litjc8RZhGMIIiiXeiw46+OdB+2Gti19NZAE
csTqqKtPbNlLGFtfBEDEFLsbV3HDiZCvP0akEpfmNGixTPrJrZv6hSK4S0L82j8mOwfBB0YGwdRb
xhA9jgXjDgMzFEUk8FCzQi8IprrX+I7TGJ6ahDOXL87klI3ZWJKr4UXy7lOanAzW25QoKyDfFsiT
SIE56GWJIkRos1FY8z2uNeVf8AnPVuog3EME5Jax4EgWofFwL7LoWzJl0h1d5vNFJRN5bMmXOmjh
4GMCRiowLd9LJDQkVOleOvGMY1wuurcONkjAumfJMeWkyWsmOvB8oDzIcAz2KNA57nHLOtSBLBUG
HFm81GRdaXSNkSf/DGB0D4OzdnEziULCTgK1Xx3GD7mLrJrrQcC27L+d5rkBjlohltOBiYsOI5zy
K8UZRZWD+rwLqeSJJoGUy/FjAxcE0aF7MarXhmaRWj3Fn1VxQumpDEH02YG3lpa8cSVVqLAHmcic
WrgVYK13wKqCAEKaaS+qVRNOpJhXHNPJ4SdMpNFiaKv/62NpoeJYFpHBb+h72G5BEnEJLkHxzD/B
D3DAO4eA1hDPUN3JiNooPTq05sPtcroRYDBeW6oSyRsoRuQtpeST7oqxKrlArgmO1Cnq1mtbzgVw
pYitvFuI6IXquW5BEqSTMcZR0pGBE5eyCMLzz7vvrx4Mwl1DgVErLVzK0xNOL5mBqwwCO4tCBCKM
0JwGzN+CFZC+NipmvvP59DL0PmwBv9dRQYU4vIt7YyI2GmTBo2cjRtwxD876fPSy2SxhW0lkujS2
M3DLCDLeTBgoti09+UJWZ26ooirEPlMwKnH7EB3Y6mh1AecaxiPXDFZn2OJoei+hM4QO/gBnG4Vu
QahUFxvTzSLt2YSkCmpM5Yk4ahhfFqLJeSGRx3p5YKAzbUSLLk+r64KUbEbGk/GcuISehNL0bHmi
n9DsRB6KuB6FyKCTA9dDXl62yDM9kLyUUDYHQ6JhxzVS33UMTb1NpZ6mu665TPcpaEG5CpPRDSk5
Y0uNOvYWkRZGChCcpF+YpwSUUezz7iXVEl4cr/ymuobNbDB5IL+3y+JPbYR8gRIlJ2d/DoCLK1IO
Z9DGVkremhP1QUjaYPuppemsYfmhQMR76nNi5V/2PFEDKa0bud2oVKN7FyoGpEdbOyQdFscDGfyB
hMywaQe3E8Fu7tUmXIoDJ0HhupgdN1iohdUFk7kJ1cA7mYxyULFuFeXjztZAiqAMh52wDa29ZNop
ZfD/xdyRThQkO0xmZAA=


--===============6351896573131827017==--