bzr commit into mysql-5.1-telco-7.0-spj branch (ole.john.aske:3178)

[Ole John Aske]

#At file:///export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj/ based on revid:ole.john.aske@stripped

 3178 Ole John Aske	2010-06-21
      Changed the c'tor ::ndb_table_access_map(table_map) to not depend
      on Bitmap<>::set_map(table_map) which is still not available 
      in the main 5.1 branch.

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-06-21 08:11:42 +0000
+++ b/sql/ha_ndbcluster.cc	2010-06-21 09:33:55 +0000
@@ -249,9 +249,16 @@ public:
    : TABLE_BITMAP(0)
   {}
 
-  explicit ndb_table_access_map(const table_map& table)
+  explicit ndb_table_access_map(table_map bitmap)
    : TABLE_BITMAP(0)
-  { set_map(table); }
+//{ set_map(table); } .. Bitmap<>::set_map() is expected to be available in the near future
+  {
+    for (uint i= 0; bitmap!=0; i++, bitmap>>=1)
+    {
+      if (bitmap & 1)
+        set_bit(i);
+    }
+  }
 
   explicit ndb_table_access_map(const AQP::Table_access* const table)
    : TABLE_BITMAP(0)


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