Changeset: fdd3562dc126 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fdd3562dc126
Modified Files:
clients/Tests/exports.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
Branch: default
Log Message:
Approve output
diffs (57 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
@@ -260,6 +260,8 @@ gdk_return GDKreleasemmap(void *ptr, siz
gdk_return GDKreleasesem(int sem_id, str *msg);
void GDKreset(int status);
void GDKsetenv(str name, str value);
+void GDKsetmemorylimit(size_t nbytes);
+void GDKsetmemorylimit(size_t nbytes){ GDK_mallocedbytes_limit = nbytes;
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
@@ -1201,6 +1203,7 @@ str IOimport(void *ret, bat *bid, str *f
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str IOsetmemorylimit(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
34, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
@@ -96,10 +96,10 @@ Ready.
% schema, table, column, type, mode, typewidth, hashes, phash,
imprints, sorted # name
% clob, clob, clob, clob, clob, int, bigint, boolean,
bigint, boolean # type
% 3, 7, 13, 8, 8, 2, 4, 5, 1, 5 #
length
-[ "sys", "_tables", "id", "int", "writable", 4, 2600,
false, 0, false ]
+[ "sys", "_tables", "id", "int", "writable", 4, 1064,
false, 0, false ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
33, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
diff --git a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
--- a/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
+++ b/sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
@@ -74,7 +74,7 @@ Ready.
[ "sys", "_tables", "id", "int", "writable", 4, 0,
false, 0, true ]
[ "sys", "_tables", "name", "varchar", "writable", 8,
0, false, 0, false ]
[ "sys", "_tables", "schema_id", "int", "writable", 4,
0, false, 0, false ]
-[ "sys", "_tables", "query", "varchar", "writable",
45, 0, false, 0, false ]
+[ "sys", "_tables", "query", "varchar", "writable",
34, 0, false, 0, false ]
[ "sys", "_tables", "type", "smallint", "writable", 2,
0, false, 0, false ]
[ "sys", "_tables", "system", "boolean", "writable",
1, 0, false, 0, false ]
[ "sys", "_tables", "commit_action", "smallint",
"writable", 2, 0, false, 0, false ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
