bk commit into 5.1 tree (Justin.He:1.2440) BUG#25880

[justin.he]

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, 2007-03-05 13:30:28+08:00, Justin.He@stripped +1 -0
  BUG#25880, Adding new column to ndb_dd table moves data for non_indexed fields in memory
  correct the inconsistency between columns' storage type with table's storage_media & tablespace

  sql/ha_ndbcluster.cc@stripped, 2007-03-05 13:30:25+08:00, Justin.He@stripped +2 -1
    move something to proper location, 
    then columns' storage type are consistent with table's storage_media & tablespace

# 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-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug25880-5.1-new-ndb-bj

--- 1.408/sql/ha_ndbcluster.cc	2007-03-05 13:30:35 +08:00
+++ 1.409/sql/ha_ndbcluster.cc	2007-03-05 13:30:35 +08:00
@@ -4831,7 +4831,8 @@
     if ((my_errno= create_ndb_column(col, field, create_info)))
       DBUG_RETURN(my_errno);
  
-    if (create_info->storage_media == HA_SM_DISK)
+    if (create_info->storage_media == HA_SM_DISK ||
+        create_info->tablespace)
       col.setStorageType(NdbDictionary::Column::StorageTypeDisk);
     else
       col.setStorageType(NdbDictionary::Column::StorageTypeMemory);