Changeset: ced42dde0748 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ced42dde0748
Modified Files:
monetdb5/modules/atoms/batxml.c
monetdb5/modules/mal/mal_mapi.c
sql/server/rel_rel.c
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (75 lines):
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -524,7 +524,7 @@ BATXMLoptions(Client ctx, bat *ret, cons
snprintf(buf, size, "nil");
else {
/*if(strcmp(*options,"niloncontent")==0) */
- err = SQLSTATE(0 A000) PROGRAM_NYI;
+ err = SQLSTATE(0A000) PROGRAM_NYI;
goto bunins_failed;
}
@@ -1527,7 +1527,7 @@ BATXMLxquery(Client ctx, bat *ret, const
(void) bid;
(void) expr;
/* use external library to solve this */
- throw(MAL, "xml.xquery", SQLSTATE(0 A000) PROGRAM_NYI);
+ throw(MAL, "xml.xquery", SQLSTATE(0A000) PROGRAM_NYI);
}
#else
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -1728,7 +1728,7 @@ SERVERquery_array(Client ctx, MalBlkPtr
(void) ctx, (void) mb;
(void) stk;
(void) pc;
- throw(MAL, "mapi.query_array", SQLSTATE(0 A000) PROGRAM_NYI);
+ throw(MAL, "mapi.query_array", SQLSTATE(0A000) PROGRAM_NYI);
}
static str
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -382,7 +382,7 @@ SYSMONpause(Client cntxt, MalBlkPtr mb,
return paused ? MAL_SUCCEED :
i == qsize ? createException(MAL, "SYSMONpause",
-
SQLSTATE(42 S12) "Tag " OIDFMT
+
SQLSTATE(42S12) "Tag " OIDFMT
" unknown.",
tag) : createException(MAL,
"SYSMONpause",
@@ -441,7 +441,7 @@ SYSMONresume(Client cntxt, MalBlkPtr mb,
return paused ? MAL_SUCCEED :
i == qsize ? createException(MAL, "SYSMONresume",
-
SQLSTATE(42 S12) "Tag " OIDFMT
+
SQLSTATE(42S12) "Tag " OIDFMT
" unknown.",
tag) : createException(MAL,
"SYSMONresume",
@@ -500,7 +500,7 @@ SYSMONstop(Client cntxt, MalBlkPtr mb, M
return paused ? MAL_SUCCEED :
i == qsize ? createException(MAL, "SYSMONstop",
-
SQLSTATE(42 S12) "Tag " OIDFMT
+
SQLSTATE(42S12) "Tag " OIDFMT
" unknown.",
tag) : createException(MAL,
"SYSMONstop",
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -866,7 +866,7 @@ rel_setop_n_ary_set_exps(mvc *sql, sql_r
for (node *m = exps->h, *o = rexps->h; m && o; m = m->next, o =
o->next) {
sql_exp *e = m->data, *f = o->data;
/* for multi-union if any operand has nil then set the
nil prop for the op exp */
- if (is_munion(rel->op) && has_nil(f))
+ if (is_munion(rel->op) && (f && has_nil(f)))
set_has_nil(e);
e->card = CARD_MULTI;
}
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
