Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj

into  dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug23576-5.1-new-ndb-bj

sql/ha_ndbcluster.cc

@@ -4706,10 +4706,18 @@ int ha_ndbcluster::create(const char *name,
   }
 
   if (info->store_on_disk)
+  { 
     if (info->tablespace)
       tab.setTablespace(info->tablespace);
     else
       tab.setTablespace("DEFAULT-TS");
+  }
+  else if (info->tablespace)
+  {
+    tab.setTablespace(info->tablespace);
+    info->store_on_disk = true;  //if use tablespace, that also means store on disk
+  }
+
   // No primary key, create shadow key as 64 bit, auto increment  
   if (form->s->primary_key == MAX_KEY) 
   {