diff options
| author | mskold/marty@mysql.com/linux.site <> | 2006-12-20 15:15:26 +0100 |
|---|---|---|
| committer | mskold/marty@mysql.com/linux.site <> | 2006-12-20 15:15:26 +0100 |
| commit | f55af1eadeb838ed082f5ab2b7ca75d42ffb3535 (patch) | |
| tree | efca6090fd946bf6c843f6b8a51f0662aa3e9d0e /sql/ha_ndbcluster.cc | |
| parent | 226e2be1b1f2d39f2e7a01337f56f32a0333f0ba (diff) | |
| download | mariadb-git-f55af1eadeb838ed082f5ab2b7ca75d42ffb3535.tar.gz | |
ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
Diffstat (limited to 'sql/ha_ndbcluster.cc')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index f83589dd758..a606d7f77d0 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -4836,6 +4836,16 @@ int ha_ndbcluster::create(const char *name, } else if (info->tablespace) { + if (info->storage_media == HA_SM_MEMORY) + { + push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, + ER_ILLEGAL_HA_CREATE_OPTION, + ER(ER_ILLEGAL_HA_CREATE_OPTION), + ndbcluster_hton_name, + "TABLESPACE currently only supported for " + "STORAGE DISK"); + DBUG_RETURN(HA_ERR_UNSUPPORTED); + } tab.setTablespace(info->tablespace); info->storage_media = HA_SM_DISK; //if use tablespace, that also means store on disk } |