MonetDB: Oct2014 - Extend the standard error list

[Martin Kersten]

Changeset: 7884aea64477 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7884aea64477
Modified Files:
        monetdb5/mal/mal_errors.h
        monetdb5/mal/mal_exception.c
        monetdb5/mal/mal_exception.h
Branch: Oct2014
Log Message:

Extend the standard error list


diffs (34 lines):

diff --git a/monetdb5/mal/mal_errors.h b/monetdb5/mal/mal_errors.h
--- a/monetdb5/mal/mal_errors.h
+++ b/monetdb5/mal/mal_errors.h
@@ -140,4 +140,5 @@
 #define XML_ILLEGAL_CONTENT "Illegal content"
 
 #define GDK_EXCEPTION "GDK reported error."
+#define MAL_DEPRECATED "Deprecated MAL operation."
 #endif /* MAL_ERRORS */
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -41,7 +41,7 @@ static char *exceptionNames[] = {
 /*12 */        "PermissionDeniedException",
 /*13 */        "SQLException",
 /*14 */        "RDFException",
-/*15 */        "XQUERYException",
+/*15 */        "Deprecated operation",
 /*EOE*/        NULL
 };
 
diff --git a/monetdb5/mal/mal_exception.h b/monetdb5/mal/mal_exception.h
--- a/monetdb5/mal/mal_exception.h
+++ b/monetdb5/mal/mal_exception.h
@@ -40,8 +40,7 @@ enum malexception {
        ARITH,
        PERMD,
        SQL,
-       RDF,
-       XQUERY
+       RDF
 };
 
 #define MAL_SUCCEED ((str) 0) /* no error */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list