bzr commit into mysql-5.5-cluster-alter branch (Martin.Skold:3352)

[Martin Skold]

#At file:///home/marty/MySQL/mysql-5.5-telco-7.0/ based on revid:magnus.blaudd@stripped

 3352 Martin Skold	2011-06-08
      Removed incorrect error check, TABLESPACE is allowed for memory tables, but have no effect

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-05-30 21:13:02 +0000
+++ b/sql/ha_ndbcluster.cc	2011-06-08 11:56:29 +0000
@@ -8367,19 +8367,6 @@ int ha_ndbcluster::create(const char *na
     else
       tab.setTablespaceName("DEFAULT-TS");
   }
-  else if (create_info->tablespace && 
-           create_info->storage_media == HA_SM_MEMORY)
-  {
-    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                        ER_ILLEGAL_HA_CREATE_OPTION,
-                        ER(ER_ILLEGAL_HA_CREATE_OPTION),
-                        ndbcluster_hton_name,
-                        "TABLESPACE currently only supported for "
-                        "STORAGE DISK"); 
-    result= HA_ERR_UNSUPPORTED;
-    goto abort_return;
-  }
-
   DBUG_PRINT("info", ("Table %s is %s stored with tablespace %s",
                       m_tabname,
                       (use_disk) ? "disk" : "memory",


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