bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4475)

[magnus.blaudd]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]