Commit b285de29 authored by unknown's avatar unknown
Browse files

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged
parents e836054b 8b468256

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -4831,7 +4831,8 @@ int ha_ndbcluster::create(const char *name, 
    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);