summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authortomas@mc05.(none) <>2004-05-10 14:25:32 +0200
committertomas@mc05.(none) <>2004-05-10 14:25:32 +0200
commit718efc3964f1b65a3c5de1ae5e5203a098acd7f1 (patch)
tree1320c8e45d559c497f7cc0b03c8650888b76b14a /ndb
parent62565bede8ded276b5f29ee54f4e2351b2c6ef2c (diff)
downloadmariadb-git-718efc3964f1b65a3c5de1ae5e5203a098acd7f1.tar.gz
make warning fixes for ndb
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/common/util/strlcat.c2
-rw-r--r--ndb/src/mgmsrv/CommandInterpreter.cpp2
-rw-r--r--ndb/src/ndbapi/NdbSchemaOp.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/ndb/src/common/util/strlcat.c b/ndb/src/common/util/strlcat.c
index ccff15da27f..bf8b0d9a5cb 100644
--- a/ndb/src/common/util/strlcat.c
+++ b/ndb/src/common/util/strlcat.c
@@ -39,7 +39,7 @@
/* RCSID("$KTH: strlcat.c,v 1.1 2000/08/16 01:23:47 lha Exp $"); */
-//#include <NdbString.h>
+/*#include <NdbString.h>*/
#ifndef HAVE_STRLCAT
size_t
diff --git a/ndb/src/mgmsrv/CommandInterpreter.cpp b/ndb/src/mgmsrv/CommandInterpreter.cpp
index 1588e16b4e4..8a7293b8434 100644
--- a/ndb/src/mgmsrv/CommandInterpreter.cpp
+++ b/ndb/src/mgmsrv/CommandInterpreter.cpp
@@ -646,7 +646,7 @@ versionCallback(int nodeId, int version, void * anyData, int errCode){
}
break;
case NDB_MGM_NODE_TYPE_UNKNOWN:
- assert(0);
+ abort();
};
} else {
diff --git a/ndb/src/ndbapi/NdbSchemaOp.cpp b/ndb/src/ndbapi/NdbSchemaOp.cpp
index f0265e41cfc..9e495229661 100644
--- a/ndb/src/ndbapi/NdbSchemaOp.cpp
+++ b/ndb/src/ndbapi/NdbSchemaOp.cpp
@@ -140,8 +140,8 @@ NdbSchemaOp::createAttribute( const char* anAttrName,
case String:
col.setType(NdbDictionary::Column::Char);
break;
- default:
- assert(0);
+ case NoAttrTypeDef:
+ abort();
}
col.setLength(anArraySize);
col.setNullable(nullable);