Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName

6 files changed, 13 insertions, 7 deletions

diff --git a/storage/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp
index 1945a644571..aada314e454 100644
--- a/storage/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp
@@ -809,9 +809,9 @@ public:
      */
     void setMaxLoadFactor(int);
 
-    void setTablespace(const char * name);
+    void setTablespaceName(const char * name);
+    const char * getTablespaceName() const;
     void setTablespace(const class Tablespace &);
-    const char * getTablespace() const;
     bool getTablespace(Uint32 *id= 0, Uint32 *version= 0) const;
 
     /**
diff --git a/storage/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp
index 481b2eac6d2..47ba0335183 100644
--- a/storage/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp
@@ -663,8 +663,14 @@ NdbDictionary::Table::getTablespace(Uint32 *id, Uint32 *version) const
   return true;
 }
 
+const char *
+NdbDictionary::Table::getTablespaceName() const 
+{
+  return m_impl.m_tablespace_name.c_str();
+}
+
 void 
-NdbDictionary::Table::setTablespace(const char * name){
+NdbDictionary::Table::setTablespaceName(const char * name){
   m_impl.m_tablespace_id = ~0;
   m_impl.m_tablespace_version = ~0;
   m_impl.m_tablespace_name.assign(name);
diff --git a/storage/ndb/test/ndbapi/bank/BankLoad.cpp b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
index c033d112890..985391c0066 100644
--- a/storage/ndb/test/ndbapi/bank/BankLoad.cpp
+++ b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
@@ -163,7 +163,7 @@ int Bank::createTable(const char* tabName, bool disk){
       return NDBT_FAILED;
     }
     NdbDictionary::Table copy(* pTab);
-    copy.setTablespace("DEFAULT-TS");
+    copy.setTablespaceName("DEFAULT-TS");
     for (Uint32 i = 0; i<copy.getNoOfColumns(); i++)
       copy.getColumn(i)->setStorageType(NdbDictionary::Column::StorageTypeDisk);
     if(m_ndb.getDictionary()->createTable(copy) == -1){
diff --git a/storage/ndb/test/ndbapi/create_tab.cpp b/storage/ndb/test/ndbapi/create_tab.cpp
index cf1a543c62c..c8c7dd6e27f 100644
--- a/storage/ndb/test/ndbapi/create_tab.cpp
+++ b/storage/ndb/test/ndbapi/create_tab.cpp
@@ -37,7 +37,7 @@ g_create_hook(Ndb* ndb, NdbDictionary::Table& tab, int when, void* arg)
       }
     }
     if (g_tsname != NULL) {
-      tab.setTablespace(g_tsname);
+      tab.setTablespaceName(g_tsname);
     }
   }
   return 0;
diff --git a/storage/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index b3487e443f0..f7de43aea20 100644
--- a/storage/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
@@ -1643,7 +1643,7 @@ runCreateDiskTable(NDBT_Context* ctx, NDBT_Step* step){
   Ndb* pNdb = GETNDB(step);  
 
   NdbDictionary::Table tab = *ctx->getTab();
-  tab.setTablespace("DEFAULT-TS");
+  tab.setTablespaceName("DEFAULT-TS");
   
   for(Uint32 i = 0; i<tab.getNoOfColumns(); i++)
     if(!tab.getColumn(i)->getPrimaryKey())
diff --git a/storage/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index 71e7bf5b70b..9c908ab27c6 100644
--- a/storage/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
@@ -969,7 +969,7 @@ NDBT_TestSuite::createHook(Ndb* ndb, NdbDictionary::Table& tab, int when)
     }
     
     if (tsname != NULL) {
-      tab.setTablespace(tsname);
+      tab.setTablespaceName(tsname);
     }
   }
   return 0;