mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
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
This commit is contained in:
commit
b285de2974
1 changed files with 2 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue