diff options
| author | magnus@neptunus.(none) <> | 2004-05-28 09:51:27 +0200 |
|---|---|---|
| committer | magnus@neptunus.(none) <> | 2004-05-28 09:51:27 +0200 |
| commit | 54be4cfefddedf92f71c830f904f67e80d249832 (patch) | |
| tree | 986e4d9deef73595bdbb2ae905f3839d0ce79592 | |
| parent | ccc4171276b3712a82fd387adf3803010216bd4f (diff) | |
| parent | 60fb66f0335a0eef2cd9727c52547fa4c66278d3 (diff) | |
| download | mariadb-git-54be4cfefddedf92f71c830f904f67e80d249832.tar.gz | |
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
| -rw-r--r-- | ndb/src/Makefile | 1 | ||||
| -rw-r--r-- | ndb/src/newtonapi/dba_schema.cpp | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ndb/src/Makefile b/ndb/src/Makefile index 72333aae890..cd33563ddc1 100644 --- a/ndb/src/Makefile +++ b/ndb/src/Makefile @@ -7,6 +7,7 @@ DIRS := \ ndbapi \ mgmsrv \ mgmapi \ + newtonapi \ rep \ mgmclient \ cw \ diff --git a/ndb/src/newtonapi/dba_schema.cpp b/ndb/src/newtonapi/dba_schema.cpp index 9fa99cb5d43..1bf21f1fe80 100644 --- a/ndb/src/newtonapi/dba_schema.cpp +++ b/ndb/src/newtonapi/dba_schema.cpp @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "dba_internal.hpp" +#include "NdbSchemaCon.hpp" static bool getNdbAttr(DBA_DataTypes_t, Size_t, @@ -31,7 +32,7 @@ DBA_CreateTable(const char* TableName, if(DBA_TableExists(TableName)) return DBA_NO_ERROR; - NdbSchemaCon * schemaCon = DBA__TheNdb->startSchemaTransaction(); + NdbSchemaCon * schemaCon = NdbSchemaCon::startSchemaTrans(DBA__TheNdb); if(schemaCon == 0){ DBA__SetLatestError(DBA_NDB_ERROR, 0, "Internal NDB error: No schema transaction"); @@ -39,8 +40,8 @@ DBA_CreateTable(const char* TableName, } NdbSchemaOp * schemaOp = schemaCon->getNdbSchemaOp(); - if(schemaOp == 0){ - DBA__TheNdb->closeSchemaTransaction(schemaCon); + if(schemaOp == 0){ + NdbSchemaCon::closeSchemaTrans(schemaCon); DBA__SetLatestError(DBA_NDB_ERROR, 0, "Internal NDB error: No schema op"); return DBA_NDB_ERROR; @@ -56,7 +57,7 @@ DBA_CreateTable(const char* TableName, 80, 1, false) == -1){ - DBA__TheNdb->closeSchemaTransaction(schemaCon); + NdbSchemaCon::closeSchemaTrans(schemaCon); DBA__SetLatestError(DBA_NDB_ERROR, 0, "Internal NDB error: Create table failed"); return DBA_NDB_ERROR; @@ -71,7 +72,7 @@ DBA_CreateTable(const char* TableName, &attrSize, &arraySize, &attrType)){ - DBA__TheNdb->closeSchemaTransaction(schemaCon); + NdbSchemaCon::closeSchemaTrans(schemaCon); DBA__SetLatestError(DBA_APPLICATION_ERROR, 0, "Invalid datatype/size combination"); return DBA_APPLICATION_ERROR; @@ -82,7 +83,7 @@ DBA_CreateTable(const char* TableName, attrSize, arraySize, attrType) == -1){ - DBA__TheNdb->closeSchemaTransaction(schemaCon); + NdbSchemaCon::closeSchemaTrans(schemaCon); DBA__SetLatestError(DBA_NDB_ERROR, 0, "Internal NDB error: Create attribute failed"); return DBA_NDB_ERROR; @@ -90,14 +91,14 @@ DBA_CreateTable(const char* TableName, } if(schemaCon->execute() == -1){ - DBA__TheNdb->closeSchemaTransaction(schemaCon); + NdbSchemaCon::closeSchemaTrans(schemaCon); DBA__SetLatestError(DBA_NDB_ERROR, 0, "Internal NDB error: Execute schema failed"); return DBA_NDB_ERROR; } - DBA__TheNdb->closeSchemaTransaction(schemaCon); - + NdbSchemaCon::closeSchemaTrans(schemaCon); + return DBA_NO_ERROR; } |