Changeset: d5c73a3da130 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d5c73a3da130
Modified Files:
clients/Tests/exports.stable.out
sql/backends/monet5/sql.c
Branch: nested
Log Message:
approved output
added missing client context
diffs (43 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -483,6 +483,7 @@ BAT *canditer_slice(const struct candite
BAT *canditer_slice2(const struct canditer *ci, BUN lo1, BUN hi1, BUN lo2, BUN
hi2);
BAT *canditer_slice2val(const struct canditer *ci, oid lo1, oid hi1, oid lo2,
oid hi2);
BAT *canditer_sliceval(const struct canditer *ci, oid lo, oid hi);
+allocator *create_allocator(allocator *pa, const char *, bool use_lock);
char *ctime_r(const time_t *restrict, char *restrict);
date date_add_day(date dt, int days) __attribute__((__const__));
date date_add_month(date dt, int months) __attribute__((__const__));
@@ -782,7 +783,7 @@ str COPYrejects_clear(Client cntxt, MalB
str GRPgroup1(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid);
str GRPsubgroup5(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid,
const bat *sid, const bat *gid, const bat *eid, const bat *hid);
void JSONfree(JSON *jt);
-JSON *JSONparse(const char *j);
+JSON *JSONparse(allocator *ma, const char *j);
int MAL_MAXCLIENTS;
int MALcommentsOnly(MalBlkPtr mb);
lng MALdebug;
@@ -1031,6 +1032,8 @@ const char hgeRef[];
const char identityRef[];
const char ifthenelseRef[];
const char importColumnRef[];
+const char importNulTerminatedRef[];
+const char importRawRef[];
void initNamespace(void);
void insertSymbol(Module scope, Symbol prg);
str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1183,8 +1183,9 @@ mvc_next_value_ms(Client cntxt, MalBlkPt
}
static str
-mvc_next_value_ms_cntr(bat *res, int *rcntr, bat *in, int *icntr)
+mvc_next_value_ms_cntr(Client ctx, bat *res, int *rcntr, bat *in, int *icntr)
{
+ (void)ctx;
BAT *b = BATdescriptor(*in);
if (!b)
return createException(SQL, "sql.next_value", SQLSTATE(HY002)
RUNTIME_OBJECT_MISSING);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
