Changeset: 1cc1ab58ee06 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1cc1ab58ee06
Modified Files:
clients/Tests/exports.stable.out
monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out
monetdb5/modules/mosaic/mosaic_dictionary.c
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/wlcr/Tests/wlr70.stable.err
Branch: mosaic
Log Message:
Fix and approve tests
diffs (82 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
@@ -462,6 +462,7 @@ char *msab_retreatScenario(const char *l
char *msab_serialise(char **ret, const sabdb *db);
char *msab_wildRetreat(void);
BitVector newBitVector(BUN cnt, int width);
+float nextafterf(float x, float y);
const oid oid_nil;
DIR *opendir(const char *dirname);
void print_trace(void);
@@ -2485,7 +2486,6 @@ int newTmpVariable(MalBlkPtr mb, malType
int newTypeVariable(MalBlkPtr mb, malType type);
int newVariable(MalBlkPtr mb, const char *name, size_t len, malType type);
str nextRef;
-float nextafterf(float x, float y);
str notRef;
str not_ilikeRef;
str not_likeRef;
diff --git a/monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out
b/monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out
--- a/monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out
+++ b/monetdb5/modules/mosaic/Tests/mosaic_mix_joins.stable.out
@@ -99,6 +99,9 @@ Ready.
# h t # name
# void int # type
#--------------------------#
+[ 0@0, 0 ]
+[ 1@0, 2 ]
+[ 2@0, 50 ]
#--------------------------#
# h t t # name
# void oid oid # type
diff --git a/monetdb5/modules/mosaic/mosaic_dictionary.c
b/monetdb5/modules/mosaic/mosaic_dictionary.c
--- a/monetdb5/modules/mosaic/mosaic_dictionary.c
+++ b/monetdb5/modules/mosaic/mosaic_dictionary.c
@@ -131,16 +131,17 @@ MOSlayout_dictionary_hdr(Client cntxt, M
lng zero=0;
int i;
char buf[BUFSIZ];
+ char bufv[BUFSIZ];
(void) cntxt;
for(i=0; i< task->hdr->dictsize; i++){
snprintf(buf, BUFSIZ,"dictionary[%d]",i);
- MOSdump_dictionaryInternal(buf, BUFSIZ, task,i);
+ MOSdump_dictionaryInternal(bufv, BUFSIZ, task,i);
if( BUNappend(btech, buf, FALSE) != GDK_SUCCEED ||
BUNappend(bcount, &zero, FALSE) != GDK_SUCCEED ||
BUNappend(binput, &zero, FALSE) != GDK_SUCCEED ||
BUNappend(boutput, &task->hdr->dictfreq[i], FALSE) !=
GDK_SUCCEED ||
- BUNappend(bproperties, buf, FALSE) != GDK_SUCCEED)
+ BUNappend(bproperties, bufv, FALSE) != GDK_SUCCEED)
return;
}
}
diff --git
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
---
a/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
+++
b/sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
@@ -129,9 +129,9 @@ Ready.
% function_id # name
% int # type
% 4 # length
-[ 6874 ]
-[ 6884 ]
-[ 6894 ]
+[ 6875 ]
+[ 6885 ]
+[ 6895 ]
#SELECT * FROM sys.args WHERE func_id NOT IN (SELECT id FROM sys.functions);
% sys.args, sys.args, sys.args, sys.args, sys.args,
sys.args, sys.args, sys.args # table_name
% id, func_id, name, type, type_digits, type_scale, inout,
number # name
diff --git a/sql/test/wlcr/Tests/wlr70.stable.err
b/sql/test/wlcr/Tests/wlr70.stable.err
--- a/sql/test/wlcr/Tests/wlr70.stable.err
+++ b/sql/test/wlcr/Tests/wlr70.stable.err
@@ -26,6 +26,7 @@ MAPI = (monetdb) /var/tmp/mtest-23854/.
QUERY = select * from tmp70;
+
# 13:16:48 >
# 13:16:48 > "Done."
# 13:16:48 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
