bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3307)

[Magnus Blåudd]

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped3kj

 3307 Magnus Blåudd	2011-03-28
      ndb
       - adapt ndbcluster_alter_table_flags to new flags indicating what
         is supported by handler

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-03-28 08:30:40 +0000
+++ b/sql/ha_ndbcluster.cc	2011-03-28 09:10:35 +0000
@@ -298,12 +298,26 @@ ndbcluster_alter_partition_flags()
 static uint
 ndbcluster_alter_table_flags(uint flags)
 {
+  const uint f=
+    HA_INPLACE_ADD_INDEX_NO_READ_WRITE |
+    HA_INPLACE_DROP_INDEX_NO_READ_WRITE |
+    HA_INPLACE_ADD_UNIQUE_INDEX_NO_READ_WRITE |
+    HA_INPLACE_DROP_UNIQUE_INDEX_NO_READ_WRITE |
+    HA_INPLACE_ADD_PK_INDEX_NO_READ_WRITE |
+    HA_INPLACE_DROP_PK_INDEX_NO_READ_WRITE |
+    HA_INPLACE_ADD_INDEX_NO_WRITE |
+    HA_INPLACE_DROP_INDEX_NO_WRITE |
+    HA_INPLACE_ADD_UNIQUE_INDEX_NO_WRITE |
+    HA_INPLACE_DROP_UNIQUE_INDEX_NO_WRITE |
+    HA_INPLACE_ADD_PK_INDEX_NO_WRITE |
+    HA_INPLACE_DROP_PK_INDEX_NO_WRITE |
+    HA_PARTITION_FUNCTION_SUPPORTED |
+    0;
+
   if (flags & ALTER_DROP_PARTITION)
     return 0;
-  else
-    return (HA_ONLINE_ADD_INDEX | HA_ONLINE_DROP_INDEX |
-            HA_ONLINE_ADD_UNIQUE_INDEX | HA_ONLINE_DROP_UNIQUE_INDEX |
-            HA_PARTITION_FUNCTION_SUPPORTED);
+
+  return f;
 }
 #endif
 

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