bk commit into 5.1 tree (Justin.He:1.2320) BUG#23576

[jhe]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-15 13:43:02+08:00, Justin.He@stripped +1 -0
  BUG#23576, Table is created although tablespace does not exist

  sql/ha_ndbcluster.cc@stripped, 2006-11-15 13:42:57+08:00, Justin.He@stripped +8
-0
    if use tablespace, that also means store on disk, so pass tablespace's name to ndb,
    then will get a error from ndb and its cause;

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Justin.He
# Host:	dev3-47.dev.cn.tlan
# Root:	/mnt/sda7/justin.he/mysql/mysql-5.1/bug23576-5.1-new-ndb-bj

--- 1.359/sql/ha_ndbcluster.cc	2006-11-15 13:43:13 +08:00
+++ 1.360/sql/ha_ndbcluster.cc	2006-11-15 13:43:13 +08:00
@@ -4706,10 +4706,18 @@
   }
 
   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) 
   {