MonetDB: protocol - Merge with default.
Changeset: 6013fa661bae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6013fa661bae
Modified Files:
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_logger.c
gdk/gdk_orderidx.c
monetdb5/mal/mal_stack.c
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/02.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/02.stable.out
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/storage/store.c
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/sql_xml/Tests/xml.reqtests
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 593 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -74,8 +74,7 @@ insert_string_bat(BAT *b, BAT *n, BAT *s
assert(b->ttype == TYPE_str);
/* only transient bats can use some other bat's string heap */
- assert(b->batRole == TRANSIENT ||
- b->tvheap->parentid == abs(b->batCacheid));
+ assert(b->batRole == TRANSIENT || b->tvheap->parentid == b->batCacheid);
if (n->batCount == 0 || (s && s->batCount == 0))
return GDK_SUCCEED;
ni = bat_iterator(n);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1297,7 +1297,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
name,
(list_bid == catalog_bid) ?
BUNtvar(iter, p) : "snapshot");
assert(BBPindex(name));
- n[i++] = abs(BBPindex(name));
+ n[i++] = BBPindex(name);
}
}
/* now commit catalog, so it's also up to date on disk */
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -173,6 +173,7 @@ BATorderidx(BAT *b, int stable)
oid *restrict mv;
oid seq;
BUN p, q;
+ BAT *bn = NULL;
if (BATcheckorderidx(b))
return GDK_SUCCEED;
@@ -195,7 +196,7 @@ BATorderidx(BAT *b, int stable)
if (!BATtdense(b)) {
/* we need to sort a copy of the column so as not to
* change the original */
- BAT *bn = COLcopy(b, b->ttype, TRUE, TRANSIENT);
+ bn = COLcopy(b, b->ttype, TRUE, TRANSIENT);
if (bn == NULL) {
HEAPfree(m, 1);
GDKfree(m);
@@ -219,7 +220,11 @@ BATorderidx(BAT *b, int stable)
BATcount(bn), Tsize(bn), SIZEOF_OID,
bn->ttype);
}
- BBPunfix(bn->batCacheid);
+ /* we must unfix after releasing the lock since we
+* might get deadlock otherwise (we're holding a lock
+* based on b->batCacheid; unfix tries to get a lock
+* based on bn->batCacheid, usually but (crucially)
+* not always a different lock) */
}
b->torderidx = m;
@@ -227,6 +232,9 @@ BATorderidx(BAT *b, int stable)
persistOIDX(b);
MT_lock_unset((b->batCacheid));
+ if (bn)
+ BBPunfix(bn->batCacheid);
+
return GDK_SUCCEED;
}
@@ -514,7 +522,10 @@ OIDXdestroy(BAT *b)
Heap *hp;
MT_lock_set((b->batCacheid));
- if ((hp = b->torderidx) == (Heap *) 1) {
+ hp = b->torderidx;
+ b->torderidx = NULL;
+ MT_lock_unset((b->batCacheid));
+ if (hp == (Heap *) 1) {
GDKunlink(BBPselectfarm(b->batRole, b->ttype,
orderidxheap),
BATDIR,
BBP_physical(b->batCacheid),
@@ -523,7 +534,5 @@ OIDXdestroy(BAT *b)
HEAPdelete(hp, BBP_physical(b->batCacheid),
"torderidx");
GDKfree(hp);
}
- b->torderidx = NULL;
- MT_lock_unset((b->batCacheid));
}
}
diff --git a/monetdb5/mal/mal_stack.c b/monetdb5/mal/mal_stack.c
--- a/monetdb5/mal/mal_stack.c
+++ b/monetdb5/mal/mal_stack.c
@@ -115,6 +115,10 @@ clearStack(MalStkPtr s)
GDKfree(v->val.pval);
v->vtype = 0;
v->val.pval = NULL;
+ } else if (BATatoms[v->vtype].atomUnfix) {
+ BATatoms[v->vtype].atomUnfix(VALget(v));
+ v->vtype = 0;
+ v->val.pval = NULL;
}
s->stkbot = 0;
}
diff --git a/sql/server/rel_optimizer.c
MonetDB: protocol - Merge with default.
Changeset: cc9f01720b29 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc9f01720b29 Added Files: sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal sql/backends/monet5/UDF/pyapi3/Makefile.ag sql/backends/monet5/UDF/pyapi3/Tests/All sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_00.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_01.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_02.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_03.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_04.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_05.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_06.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_07.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_09.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_10.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_11.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_12.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_13.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_15.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_16.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_17.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_18.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_19.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_20.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_21.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_23.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_24.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_25.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_26.stable.out sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.SQL.sh sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.stable.err sql/backends/monet5/UDF/pyapi3/Tests/pyapi3_27.stable.out
MonetDB: protocol - Merge with default.
Changeset: fd5551fdc6c3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd5551fdc6c3
Modified Files:
.hgtags
MonetDB.spec
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
clients/R/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
debian/changelog
gdk/gdk_heap.c
gdk/libbat.rc
geom/monetdb5/geom.c
libversions
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_errors.h
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_support.c
monetdb5/scheduler/srvpool.c
monetdb5/tools/libmonetdb5.rc
sql/backends/monet5/Tests/pyloader04.stable.err
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/connection.h
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/conversion.h
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/formatinput.h
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/UDF/pyapi/pyheader.h
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/UDF/pyapi/pytypes.c
sql/backends/monet5/UDF/pyapi/pytypes.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/UDF/pyapi/undef.h
sql/backends/monet5/UDF/pyapi/unicode.c
sql/backends/monet5/UDF/pyapi/unicode.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/storage/store.c
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out
tools/merovingian/daemon/controlrunner.c
tools/mserver/mserver5.c
vertoo.data
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 11265 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -656,3 +656,6 @@ 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b
615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_SP2_release
566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_11
566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_SP3_release
+94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_13
+566c4291d2c2547a2360097c9a1038c2d2064ec3 Dec2016_SP3_release
+94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_SP3_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -944,6 +944,22 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* Wed Mar 29 2017 Sjoerd Mullender - 11.25.13-20170329
+- Rebuilt.
+- BZ#6216: Assertion raised (sqlsmith)
+- BZ#6227: Monetdb fails on remote tables
+- BZ#6242: Crash on rel_reduce_groupby_exps (sqlsmith)
+- BZ#6243: Static optimization gives wrong result (1 + NULL = -127)
+- BZ#6245: Nested query crashes all versions of MonetDB or gives wrong
+ result starting from Dec2016-SP2
+- BZ#6246:
MonetDB: protocol - Merge with default.
Changeset: 5f28f26b9f74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5f28f26b9f74
Added Files:
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.sql
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.err
sql/test/BugTracker-2017/Tests/crash_after_oidx_on_sys_statistics.Bug-6251.stable.out
sql/test/orderidx/Tests/oidx_all_types.sql
sql/test/orderidx/Tests/oidx_all_types.stable.err
sql/test/orderidx/Tests/oidx_all_types.stable.out
sql/test/orderidx/Tests/oidx_hge_type.sql
sql/test/orderidx/Tests/oidx_hge_type.stable.err
sql/test/orderidx/Tests/oidx_hge_type.stable.out.int128
Modified Files:
gdk/gdk_calc.c
geom/monetdb5/geom_upgrade.c
monetdb5/extras/rapi/converters.c.h
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal_authorize.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/oltp.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/txtsim.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_wrapper.c
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/UDF/cudf/udf.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/benchmarks/tpch/load.sh
sql/server/rel_rel.c
sql/server/rel_rel.h
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_updates.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.out
sql/test/orderidx/Tests/All
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 6401 to 300 lines):
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -13253,7 +13253,7 @@ BATcalcifthenelsecst(BAT *b, BAT *b1, co
if (checkbats(b, b1, "BATcalcifthenelse") != GDK_SUCCEED)
return NULL;
- if (b->ttype != TYPE_bit || b1->ttype != c2->vtype) {
+ if (b->ttype != TYPE_bit || ATOMtype(b1->ttype) != ATOMtype(c2->vtype))
{
GDKerror("BATcalcifthenelsecst: \"then\" and \"else\" BATs have
different types.\n");
return NULL;
}
@@ -13272,7 +13272,7 @@ BATcalcifthencstelse(BAT *b, const ValRe
if (checkbats(b, b2, "BATcalcifthenelse") != GDK_SUCCEED)
return NULL;
- if (b->ttype != TYPE_bit || b2->ttype != c1->vtype) {
+ if (b->ttype != TYPE_bit || ATOMtype(b2->ttype) != ATOMtype(c1->vtype))
{
GDKerror("BATcalcifthencstelse: \"then\" and \"else\" BATs have
different types.\n");
return NULL;
}
@@ -13289,7 +13289,7 @@ BATcalcifthencstelsecst(BAT *b, const Va
BATcheck(c1, "BATcalcifthenelsecst", NULL);
BATcheck(c2, "BATcalcifthenelsecst", NULL);
- if (b->ttype != TYPE_bit || c1->vtype != c2->vtype) {
+ if (b->ttype != TYPE_bit || ATOMtype(c1->vtype) != ATOMtype(c2->vtype))
{
GDKerror("BATcalcifthencstelsecst: \"then\" and \"else\" BATs
have different types.\n");
return NULL;
}
diff --git a/geom/monetdb5/geom_upgrade.c b/geom/monetdb5/geom_upgrade.c
--- a/geom/monetdb5/geom_upgrade.c
+++ b/geom/monetdb5/geom_upgrade.c
@@ -13,83 +13,8 @@
#include
-typedef struct list_element {
- BAT *ob;
- BAT *nb;
- char *n;
-} list_element;
-
-typedef struct ulist {
- size_t capacity;
- size_t count;
- list_element *elements;
-} ulist;
-
-static ulist*
-list_init(size_t capacity)
-{
- ulist *l;
- if ((l = GDKmalloc(sizeof(ulist))) == NULL)
- return NULL;
- l->capacity = capacity;
- l->count = 0;
- if ((l->elements = GDKzalloc(capacity*sizeof(list_element))) == NULL) {
-
MonetDB: protocol - Merge with default.
Changeset: e31b8726249a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e31b8726249a Added Files: sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.sql sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.err sql/test/BugTracker-2017/Tests/one-plus-nil.Bug-6243.stable.out sql/test/BugTracker-2017/Tests/with-alias-bug.6246.sql sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.err sql/test/BugTracker-2017/Tests/with-alias-bug.6246.stable.out Removed Files: monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_statistics.h Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h gdk/gdk.h gdk/gdk_align.c gdk/gdk_atoms.c gdk/gdk_bat.c gdk/gdk_bbp.c gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_tm.c gdk/gdk_utils.c gdk/gdk_utils.h geom/monetdb5/geom.c geom/monetdb5/geomBulk.c geom/monetdb5/geom_upgrade.c monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/mal/mal.c monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.c monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_factory.c monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/color.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/str.c monetdb5/modules/atoms/uuid.c monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/groupby.c monetdb5/modules/mal/groupby.h monetdb5/modules/mal/inspect.c monetdb5/modules/mal/json_util.h monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/manifold.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/orderidx.c monetdb5/modules/mal/querylog.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_aliases.h monetdb5/optimizer/opt_candidates.c monetdb5/optimizer/opt_candidates.h monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_coercion.h monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_commonTerms.h monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_constants.h monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_costModel.h monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_dataflow.h monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_deadcode.h monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_emptybind.h monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_evaluate.h monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_garbageCollector.h monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_generator.h monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_inline.h monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_jit.h monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_json.h monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_macro.h monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_matpack.h monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mergetable.h monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_mitosis.h monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_multiplex.h monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_oltp.h monetdb5/optimizer/opt_profiler.c monetdb5/optimizer/opt_profiler.h monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_projectionpath.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_pushselect.h monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_querylog.h monetdb5/optimizer/opt_reduce.c monetdb5/optimizer/opt_reduce.h
MonetDB: protocol - Merge with default.
Changeset: 9cf801bdc763 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cf801bdc763 Added Files: README.rst clients/Tests/exports.stable.err-noapprove clients/Tests/malcheck.stable.err-noapprove clients/Tests/malcheck.stable.out-noapprove monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 monetdb5/mal/Tests/malids.malC monetdb5/mal/Tests/malids.stable.err monetdb5/mal/Tests/malids.stable.out monetdb5/modules/atoms/Tests/strappend.malC monetdb5/modules/atoms/Tests/strappend.stable.err monetdb5/modules/atoms/Tests/strappend.stable.out monetdb5/modules/kernel/Tests/select.malC monetdb5/modules/kernel/Tests/select.stable.err monetdb5/modules/kernel/Tests/select.stable.out monetdb5/modules/mal/oltp.c monetdb5/modules/mal/oltp.h monetdb5/modules/mal/oltp.mal monetdb5/optimizer/Tests/tst4006.malC monetdb5/optimizer/Tests/tst4006.stable.err monetdb5/optimizer/Tests/tst4006.stable.out monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_oltp.h monetdb5/tools/Tests/mserver5--help.stable.err.Windows sql/backends/monet5/Tests/createorreplace.sql sql/backends/monet5/Tests/createorreplace.stable.err sql/backends/monet5/Tests/createorreplace.stable.out sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/Tests/pyapi33.sql sql/backends/monet5/Tests/pyapi33.stable.err sql/backends/monet5/Tests/pyapi33.stable.out sql/backends/monet5/Tests/pyloader06.stable.out.Windows sql/backends/monet5/Tests/pyloader07.stable.out.Windows sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_cat.h sql/backends/monet5/sql_transaction.c sql/backends/monet5/sql_transaction.h sql/backends/monet5/sql_transaction.mal sql/backends/monet5/sqlcatalog.mal sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.bat sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.SQL.sh sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.err sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.timeout sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.sql sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.sql sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.err sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128 sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/all_dates.csv.gz sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.sql sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.stable.err sql/test/BugTracker-2017/Tests/avggroupbysq.Bug-6178.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.sql sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.err sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.sql sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.err sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.out sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.sql sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.err sql/test/BugTracker-2017/Tests/complicated_logic.Bug-105.stable.out sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.sql sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.err sql/test/BugTracker-2017/Tests/crash_in_null_cast.Bug-6186.stable.out sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.sql sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.err sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.sql sql/test/BugTracker-2017/Tests/crash_on_count_div_count.Bug-6201.stable.err
MonetDB: protocol - Merge with default.
Changeset: f8fa587724b9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8fa587724b9 Modified Files: .hgignore .hgtags ChangeLog ChangeLog-Archive ChangeLog.Dec2016 HowToStart.rst Makefile.ag MonetDB.spec NT/Makefile NT/installer32/cv64-32.sh NT/installer64/cv32-64.sh NT/installer64/fixmsi.py NT/monetdb_config.h.in NT/rules.msc NT/updatecodes.py NT/wincompile.py NT/winconfig.py bootstrap buildtools/ChangeLog-Archive buildtools/ChangeLog.Dec2016 buildtools/Makefile.ag buildtools/autogen/autogen.py buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/filesplit.py buildtools/autogen/autogen/msc.py buildtools/autogen/autogen/var.py buildtools/autogen/setup.py buildtools/conf/Maddlog buildtools/conf/Makefile.ag buildtools/conf/fixlicense.py buildtools/conf/rules.mk buildtools/conf/website.html buildtools/doc/HowToRelease.rst buildtools/doc/windowsbuild.rst clients/ChangeLog clients/Makefile.ag clients/NT/Makefile.ag clients/NT/mclient.bat clients/NT/msqldump.bat clients/NT/stethoscope.bat clients/R/Tests/copy_into_fwf.stable.out clients/R/Tests/dbapply.stable.out clients/R/Tests/dbi.R clients/R/Tests/dbi.stable.out clients/R/Tests/deps-test.R clients/R/Tests/dplyr-flights.R clients/R/Tests/dplyr-flights.stable.out clients/R/Tests/dplyr.R clients/R/Tests/dplyr.stable.err clients/R/Tests/dplyr.stable.out clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/malcheck.stable.out clients/examples/C/Makefile.ag clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/examples/Makefile.ag clients/examples/perl/Makefile.ag clients/examples/perl/malsample.pl clients/examples/perl/sqlsample.pl clients/examples/php/Makefile.ag clients/examples/php/sqlsample.php clients/examples/python/basics.py clients/examples/python/mclient-python2.py clients/examples/python/mclient-python3.py clients/examples/python/perf.py clients/examples/python/sqlsample.py clients/mapiclient/Makefile.ag clients/mapiclient/ReadlineTools.c clients/mapiclient/ReadlineTools.h clients/mapiclient/dotfile.py clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/dump.c clients/mapiclient/eventparser.c clients/mapiclient/eventparser.h clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/Makefile.ag clients/mapilib/mapi.c clients/mapilib/mapi.h clients/mapilib/mapi.rc clients/mapilib/monetdb-mapi.pc.in clients/odbc/Makefile.ag clients/odbc/doc/ExcelMonetDB.html clients/odbc/doc/unixODBC.html clients/odbc/driver/Makefile.ag clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCDesc.c clients/odbc/driver/ODBCDesc.h clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCEnv.h clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCError.h clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLAllocConnect.c clients/odbc/driver/SQLAllocEnv.c clients/odbc/driver/SQLAllocHandle.c clients/odbc/driver/SQLAllocStmt.c clients/odbc/driver/SQLBindCol.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLBulkOperations.c clients/odbc/driver/SQLCancel.c clients/odbc/driver/SQLCloseCursor.c clients/odbc/driver/SQLColAttribute.c clients/odbc/driver/SQLColAttributes.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLCopyDesc.c
MonetDB: protocol - Merge with default.
Changeset: 7d449794f323 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d449794f323 Added Files: debian/monetdb-python2.install monetdb5/modules/kernel/Tests/math.malC monetdb5/modules/kernel/Tests/math.stable.err monetdb5/modules/kernel/Tests/math.stable.out sql/backends/monet5/Tests/shutdown.py sql/backends/monet5/Tests/shutdown.stable.err sql/backends/monet5/Tests/shutdown.stable.out sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/conversion.h sql/backends/monet5/UDF/pyapi/pyheader.h sql/backends/monet5/UDF/pyapi/undef.h sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.sql sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.err sql/test/BugTracker-2016/Tests/case-column-when-null-Bug-6124.stable.out sql/test/BugTracker-2016/Tests/column_name_lost_in_in_operator.Bug-6123.sql sql/test/BugTracker-2016/Tests/column_name_lost_in_in_operator.Bug-6123.stable.err sql/test/BugTracker-2016/Tests/column_name_lost_in_in_operator.Bug-6123.stable.out sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.sql sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.err sql/test/BugTracker-2016/Tests/nested-subquery-in-select.Bug-6125.stable.out sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.sql sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.err sql/test/BugTracker-2016/Tests/select-in-from.Bug-6119.stable.out sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.sql sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.err sql/test/BugTracker-2016/Tests/select-in-from.Bug-6121.stable.out tools/mserver/shutdowntest.c Removed Files: sql/backends/monet5/UDF/pyapi/unspecified_evil.h Modified Files: MonetDB.spec buildtools/ChangeLog.Dec2016 buildtools/autogen/autogen/msc.py clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/tomograph.c configure.ag debian/control debian/fix-deb.sh debian/monetdb-client-testing.install debian/monetdb5-server.install debian/rules gdk/ChangeLog gdk/ChangeLog.Dec2016 gdk/Makefile.ag gdk/gdk.h gdk/gdk_align.c gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_hash.h gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_private.h gdk/gdk_project.c gdk/gdk_search.c gdk/gdk_ssort.c gdk/gdk_ssort_impl.h gdk/gdk_system.c gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/rapi.R monetdb5/mal/Tests/dataflow01.malC monetdb5/mal/Tests/performanceTests/join.malC monetdb5/mal/Tests/selecttest.malC monetdb5/mal/Tests/tst023.malC monetdb5/mal/Tests/tst033.malC monetdb5/mal/Tests/tst034.malC monetdb5/mal/Tests/tst1502.malC monetdb5/mal/Tests/tst1602.malC monetdb5/mal/Tests/tst201.malC monetdb5/mal/Tests/tst220.malC monetdb5/mal/Tests/tst233.malC monetdb5/mal/Tests/tst234.malC monetdb5/mal/Tests/tst235.malC monetdb5/mal/Tests/tst285.malC monetdb5/mal/Tests/tst903.malC monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/Tests/tst911.malC monetdb5/mal/Tests/tst911.stable.out monetdb5/mal/Tests/tst912.malC monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_module.c monetdb5/mal/mal_module.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_session.c monetdb5/mal/mal_stack.c monetdb5/modules/atoms/Tests/xml10.malC monetdb5/modules/atoms/json.c monetdb5/modules/atoms/mtime.c monetdb5/modules/kernel/Tests/All monetdb5/modules/kernel/Tests/time01.malC monetdb5/modules/kernel/aggr.mal monetdb5/modules/kernel/aggr.mal.sh monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/algebra.h monetdb5/modules/kernel/algebra.mal monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/bat5.mal monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batmmath.mal monetdb5/modules/kernel/mmath.c
MonetDB: protocol - Merge with default.
Changeset: f0db56045d9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f0db56045d9f
Modified Files:
MonetDB.spec
clients/ChangeLog
clients/Tests/exports.stable.out
clients/examples/C/Makefile.ag
clients/mapilib/mapi.h
debian/monetdb-client-testing.install
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_runtime.c
monetdb5/modules/atoms/uuid.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/sql_upgrades.c
sql/server/sql_scan.c
sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/mapi/Tests/All
sql/test/pg_regress/Tests/comments.stable.err
sql/test/pg_regress/Tests/comments.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: protocol
Log Message:
Merge with default.
diffs (truncated from 1626 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -384,8 +384,6 @@ developer.
%{_bindir}/odbcsample1
%{_bindir}/sample0
%{_bindir}/sample1
-%{_bindir}/sample2
-%{_bindir}/sample3
%{_bindir}/sample4
%{_bindir}/smack00
%{_bindir}/smack01
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Nov 16 2016 Sjoerd Mullender
+- Removed the "array" and "quick" functions from the mapi library.
+ To be precise, the removed functions are: mapi_execute_array,
+ mapi_fetch_field_array, mapi_prepare_array, mapi_query_array,
+ mapi_quick_query, mapi_quick_query_array, and mapi_quick_response.
+
* Sun Oct 30 2016 Martin Kersten
- Added a more elaborate \help command for SQL expressions.
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
@@ -510,13 +510,11 @@ MapiMsg mapi_disconnect(Mapi mid);
MapiMsg mapi_error(Mapi mid);
char *mapi_error_str(Mapi mid);
MapiMsg mapi_execute(MapiHdl hdl);
-MapiMsg mapi_execute_array(MapiHdl hdl, char **val);
MapiMsg mapi_explain(Mapi mid, FILE *fd);
MapiMsg mapi_explain_query(MapiHdl hdl, FILE *fd);
MapiMsg mapi_explain_result(MapiHdl hdl, FILE *fd);
mapi_int64 mapi_fetch_all_rows(MapiHdl hdl);
char *mapi_fetch_field(MapiHdl hdl, int fnr);
-char **mapi_fetch_field_array(MapiHdl hdl);
MapiMsg mapi_fetch_field_bigint(MapiHdl hdl, int fnr, mapi_int64 *result);
MapiMsg mapi_fetch_field_date(MapiHdl hdl, int fnr, short *year, unsigned
short *month, unsigned short *day);
MapiMsg mapi_fetch_field_double(MapiHdl hdl, int fnr, double *result);
@@ -577,17 +575,12 @@ MapiMsg mapi_param_string(MapiHdl hdl, i
MapiMsg mapi_param_type(MapiHdl hdl, int fnr, int ctype, int sqltype, void
*ptr);
MapiMsg mapi_ping(Mapi mid);
MapiHdl mapi_prepare(Mapi mid, const char *cmd);
-MapiHdl mapi_prepare_array(Mapi mid, const char *cmd, char **val);
MapiMsg mapi_prepare_handle(MapiHdl hdl, const char *cmd);
MapiHdl mapi_query(Mapi mid, const char *cmd);
-MapiHdl mapi_query_array(Mapi mid, const char *cmd, char **val);
MapiMsg mapi_query_done(MapiHdl hdl);
MapiMsg mapi_query_handle(MapiHdl hdl, const char *cmd);
MapiMsg mapi_query_part(MapiHdl hdl, const char *cmd, size_t size);
MapiHdl mapi_query_prep(Mapi mid);
-MapiHdl mapi_quick_query(Mapi mid, const char *cmd, FILE *fd);
-MapiHdl
MonetDB: protocol - Merge with default.
Changeset: 5a56c25886f3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a56c25886f3 Added Files: clients/mapiclient/dotfile.py sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out sql/test/BugTracker-2016/Tests/dce.Bug-6114.sql sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.err sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.out sql/test/BugTracker-2016/Tests/dce2.Bug-6115.sql sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.err sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.out sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.sql sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.err sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.out sql/test/BugTracker-2016/Tests/split_project.Bug-6117.sql sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.err sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.out Modified Files: clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out monetdb5/ChangeLog monetdb5/ChangeLog.Dec2016 monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/tst661.stable.out monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_runtime.c monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/modules/mal/Tests/call00.stable.out monetdb5/modules/mal/Tests/inspect00.stable.out monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/profiler.mal monetdb5/optimizer/Tests/ARexample.stable.out monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/dataflow5.stable.out monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/Tests/reorder00.stable.out monetdb5/optimizer/Tests/tst4004.stable.out monetdb5/optimizer/Tests/tst4030.stable.out monetdb5/optimizer/opt_support.c sql/ChangeLog sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/common/sql_mem.c sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out sql/jdbc/tests/Tests/Test_JdbcClient.stable.out sql/scripts/46_profiler.sql sql/server/rel_optimizer.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128 sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out sql/test/BugTracker-2012/Tests/any_null.Bug-2594.stable.out sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.out sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out
MonetDB: protocol - Merge with default.
Changeset: 5ffeb8ac82d0 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5ffeb8ac82d0 Added Files: clients/mapiclient/mhelp.c clients/mapiclient/mhelp.h monetdb5/optimizer/Tests/flowgraph.malC monetdb5/optimizer/Tests/flowgraph.stable.err monetdb5/optimizer/Tests/flowgraph.stable.out sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeamount.stable.err sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.err sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.out sql/jdbc/tests/Tests/Test_Smoreresults.SQL.bat sql/jdbc/tests/Tests/Test_Smoreresults.SQL.sh sql/jdbc/tests/Tests/Test_Smoreresults.stable.err sql/jdbc/tests/Tests/Test_Smoreresults.stable.out Removed Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single sql/benchmarks/ssbm/Tests/01-explain.SQL.py.src sql/benchmarks/ssbm/Tests/01-explain.reqtests sql/benchmarks/ssbm/Tests/01-explain.stable.err sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/01-plan.SQL.py.src sql/benchmarks/ssbm/Tests/01-plan.reqtests sql/benchmarks/ssbm/Tests/01-plan.stable.err sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-explain.SQL.py.src sql/benchmarks/ssbm/Tests/02-explain.reqtests sql/benchmarks/ssbm/Tests/02-explain.stable.err sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-plan.SQL.py.src sql/benchmarks/ssbm/Tests/02-plan.reqtests sql/benchmarks/ssbm/Tests/02-plan.stable.err sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-explain.SQL.py.src sql/benchmarks/ssbm/Tests/03-explain.reqtests sql/benchmarks/ssbm/Tests/03-explain.stable.err sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-plan.SQL.py.src sql/benchmarks/ssbm/Tests/03-plan.reqtests sql/benchmarks/ssbm/Tests/03-plan.stable.err sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-explain.SQL.py.src sql/benchmarks/ssbm/Tests/04-explain.reqtests sql/benchmarks/ssbm/Tests/04-explain.stable.err sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-plan.SQL.py.src sql/benchmarks/ssbm/Tests/04-plan.reqtests sql/benchmarks/ssbm/Tests/04-plan.stable.err sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-explain.SQL.py.src sql/benchmarks/ssbm/Tests/05-explain.reqtests sql/benchmarks/ssbm/Tests/05-explain.stable.err sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-plan.SQL.py.src sql/benchmarks/ssbm/Tests/05-plan.reqtests sql/benchmarks/ssbm/Tests/05-plan.stable.err sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-explain.SQL.py.src sql/benchmarks/ssbm/Tests/06-explain.reqtests sql/benchmarks/ssbm/Tests/06-explain.stable.err sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-plan.SQL.py.src sql/benchmarks/ssbm/Tests/06-plan.reqtests sql/benchmarks/ssbm/Tests/06-plan.stable.err sql/benchmarks/ssbm/Tests/06-plan.stable.out sql/benchmarks/ssbm/Tests/07-explain.SQL.py.src sql/benchmarks/ssbm/Tests/07-explain.reqtests sql/benchmarks/ssbm/Tests/07-explain.stable.err sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-plan.SQL.py.src sql/benchmarks/ssbm/Tests/07-plan.reqtests sql/benchmarks/ssbm/Tests/07-plan.stable.err sql/benchmarks/ssbm/Tests/07-plan.stable.out sql/benchmarks/ssbm/Tests/08-explain.SQL.py.src sql/benchmarks/ssbm/Tests/08-explain.reqtests sql/benchmarks/ssbm/Tests/08-explain.stable.err sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
MonetDB: protocol - Merge with default.
Changeset: 996fdcb5e2a2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=996fdcb5e2a2 Added Files: ChangeLog.Dec2016 buildtools/ChangeLog.Dec2016 clients/ChangeLog.Dec2016 clients/mapilib/ChangeLog.Dec2016 common/stream/ChangeLog.Dec2016 gdk/ChangeLog.Dec2016 geom/ChangeLog.Dec2016 monetdb5/ChangeLog.Dec2016 sql/ChangeLog.Dec2016 sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.err sql/test/BugTracker-2015/Tests/schema-trigger.Bug-3710.stable.out sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.sql sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.err sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.sql sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.err sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.out sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.sql sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.err sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.out sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.sql sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.stable.err sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.stable.out sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.sql sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.err sql/test/BugTracker-2016/Tests/merge-table-edit.Bug-6084.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.32bit testing/ChangeLog.Dec2016 tools/merovingian/ChangeLog.Dec2016 Removed Files: monetdb5/optimizer/opt_factorize.c monetdb5/optimizer/opt_factorize.h tools/merovingian/daemon/peering.c tools/merovingian/daemon/peering.h Modified Files: .hgtags ChangeLog MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc buildtools/ChangeLog clients/R/Tests/All clients/R/Tests/dbi.stable.err clients/R/Tests/deps-install.R clients/R/Tests/deps-test.R clients/R/Tests/install.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/mclient.1 clients/mapiclient/mclient.c clients/mapiclient/msqldump.c clients/mapiclient/stethoscope.c clients/mapiclient/tachograph.c clients/mapiclient/tomograph.c clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc common/utils/msabaoth.c common/utils/mutils.c common/utils/mutils.h configure.ag debian/monetdb5-sql.init.d gdk/ChangeLog gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_logger.c gdk/gdk_select.c gdk/libbat.rc monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/rapi/Tests/rapi02.stable.out monetdb5/extras/rapi/Tests/rapi08.malC monetdb5/mal/mal_builder.c monetdb5/mal/mal_function.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_parser.c monetdb5/modules/mal/00_batcalc_hge.mal monetdb5/modules/mal/00_batcalc_hge.mal.sh monetdb5/modules/mal/00_calc_hge.mal monetdb5/modules/mal/00_calc_hge.mal.sh monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/01_calc.mal monetdb5/modules/mal/01_calc.mal.sh monetdb5/modules/mal/clients.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/orderidx.c monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_generator.c monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_matpack.c
MonetDB: protocol - Merge with default.
Changeset: 19f650d7c7d1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=19f650d7c7d1 Added Files: sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.bat sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.SQL.sh sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.err sql/jdbc/tests/Tests/BugExecuteUpdate_Bug_3350.stable.out sql/jdbc/tests/Tests/Test_Wrapper.SQL.bat sql/jdbc/tests/Tests/Test_Wrapper.SQL.sh sql/jdbc/tests/Tests/Test_Wrapper.stable.err sql/jdbc/tests/Tests/Test_Wrapper.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.sql sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.err sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker-2016/Tests/union.Bug-6069.sql sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.err sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.out sql/test/Dependencies/Tests/Dependencies.stable.out.int128 sql/test/pg_regress/Tests/oid.stable.out.oid32 sql/test/pg_regress/Tests/without_oid.stable.out.oid32 Modified Files: clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 geom/sql/conformance/Tests/T10.stable.out geom/sql/conformance/Tests/T11.stable.out geom/sql/conformance/Tests/T12.stable.out geom/sql/conformance/Tests/T13.stable.out geom/sql/conformance/Tests/T14.stable.out geom/sql/conformance/Tests/T15.stable.out geom/sql/conformance/Tests/T16.stable.out geom/sql/conformance/Tests/T17.stable.out geom/sql/conformance/Tests/T18.stable.out geom/sql/conformance/Tests/T21.stable.out geom/sql/conformance/Tests/T22.stable.out geom/sql/conformance/Tests/T23.stable.out geom/sql/conformance/Tests/T24.stable.out geom/sql/conformance/Tests/T25.stable.out geom/sql/conformance/Tests/T26.stable.out geom/sql/conformance/Tests/T27.stable.out geom/sql/conformance/Tests/T28.stable.out geom/sql/conformance/Tests/T29.stable.out geom/sql/conformance/Tests/T30.stable.out geom/sql/conformance/Tests/T31.stable.out geom/sql/conformance/Tests/T32.stable.out geom/sql/conformance/Tests/T33.stable.out geom/sql/conformance/Tests/T34.stable.out geom/sql/conformance/Tests/T35.stable.out geom/sql/conformance/Tests/T36.stable.out geom/sql/conformance/Tests/T37.stable.out geom/sql/conformance/Tests/T38.stable.out geom/sql/conformance/Tests/T39.stable.out geom/sql/conformance/Tests/T40.stable.out geom/sql/conformance/Tests/T41.stable.out geom/sql/conformance/Tests/T42.stable.out geom/sql/conformance/Tests/T43.stable.out geom/sql/conformance/Tests/T44.stable.out geom/sql/conformance/Tests/T45.stable.out geom/sql/conformance/Tests/T46.stable.out geom/sql/conformance/Tests/T47.stable.out geom/sql/conformance/Tests/T48.stable.out geom/sql/conformance/Tests/T49.stable.out geom/sql/conformance/Tests/T50.stable.out geom/sql/conformance/Tests/T51.stable.out geom/sql/conformance/Tests/T52.stable.out geom/sql/conformance/Tests/T6.stable.out geom/sql/conformance/Tests/T7.stable.out geom/sql/conformance/Tests/T8.stable.out geom/sql/functions/Tests/ST_AsEWKT.stable.out geom/sql/functions/Tests/ST_AsText.stable.out geom/sql/functions/Tests/ST_Boundary.stable.out geom/sql/functions/Tests/ST_Contains.stable.out geom/sql/functions/Tests/ST_CoordDim.stable.out geom/sql/functions/Tests/ST_Dimension.stable.out geom/sql/functions/Tests/ST_GeomFromText.stable.out geom/sql/functions/Tests/ST_GeometryN.stable.out geom/sql/functions/Tests/ST_GeometryType.stable.out geom/sql/functions/Tests/ST_IsClosed.stable.out geom/sql/functions/Tests/ST_IsEmpty.stable.out geom/sql/functions/Tests/ST_IsRing.stable.out geom/sql/functions/Tests/ST_IsSimple.stable.out geom/sql/functions/Tests/ST_IsValid.stable.out geom/sql/functions/Tests/ST_LineFromText.stable.out geom/sql/functions/Tests/ST_MLineFromText.stable.out geom/sql/functions/Tests/ST_MPointFromText.stable.out geom/sql/functions/Tests/ST_MPolygonFromText.stable.out
MonetDB: protocol - Merge with default.
Changeset: ed71458f0ba9 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ed71458f0ba9 Added Files: sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.bat sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.SQL.sh sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.err sql/jdbc/tests/Tests/BugSetQueryTimeout_Bug_3357.stable.out sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.sql sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.err sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.sql sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.err sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.out sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.sql sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.err sql/test/BugTracker-2016/Tests/prepare_without_querycache.Bug-4047.stable.out sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.sql sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.err sql/test/BugTracker-2016/Tests/set-negative-querytimeout.Bug-6070.stable.out Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/Tests/malcheck.sh clients/mapilib/Makefile.ag clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog debian/fix-deb.sh gdk/gdk_atoms.c gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_hash.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_select.c gdk/gdk_system.c gdk/gdk_utils.c gdk/libbat.rc libversions monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/mal_profiler.c monetdb5/modules/atoms/json.c monetdb5/modules/mal/01_batcalc.mal monetdb5/modules/mal/01_batcalc.mal.sh monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/clients.c monetdb5/optimizer/Tests/dataflow3.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_matpack.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_projectionpath.c monetdb5/optimizer/opt_support.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql.c sql/backends/monet5/sql_execute.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-plan.stable.out sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
MonetDB: protocol - Merge with default.
Changeset: 04a229a89773 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3D04a229a89773 Modified Files: geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stabl= e.err sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.e= rr sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/null_as_string_errors.stable.err sql/test/copy/Tests/null_as_string_errors.stable.out testing/Mtest.py.in Branch: protocol Log Message: Merge with default. diffs (265 lines): diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err b/= geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err --- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err +++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err @@ -13,9 +13,7 @@ stderr of test 'copy_into_crash.SF-19754 MAPI =3D (monetdb) /var/tmp/mtest-27003/.s.monetdb.30235 QUERY =3D COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n'; 45111956, 'POINT(52.0697 4.3723)' -ERROR =3D !Failed to import table line 1 field 2 'geometry(4)' expected in= ' 'POINT(52.0697 4.3723)'' - - +ERROR =3D !Failed to import table line 1 field p 'geometry(4)' expected in= ' 'POINT(52.0697 4.3723)'' =20 # 13:33:18 > =20 # 13:33:18 > Done. diff --git a/sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.e= rr b/sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err --- a/sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err +++ b/sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err @@ -83,27 +83,27 @@ MAPI =3D (monetdb) /var/tmp/mtest-27483/. QUERY =3D COPY 1 RECORDS INTO my_copytest FROM stdin USING DELIMITERS '|',= '\n' NULL as ''; 123|1.01||a|b -ERROR =3D !Failed to import table line 1 field 2 'int' expected in '1.01' -MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +ERROR =3D !Failed to import table line 1 field col2 'int' expected in '1.0= 1' +MAPI =3D (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 QUERY =3D COPY 1 RECORDS INTO my_copytest FROM stdin USING DELIMITERS '|',= '\n' NULL as ''; 553|.02||a|b -ERROR =3D !Failed to import table line 1 field 2 'int' expected in '.02' -MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +ERROR =3D !Failed to import table line 1 field col2 'int' expected in '.02' +MAPI =3D (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 QUERY =3D COPY 1 RECORDS INTO my_copytest FROM stdin USING DELIMITERS '|',= '\n' NULL as ''; 223|2.03||a|b -ERROR =3D !Failed to import table line 1 field 2 'int' expected in '2.03' -MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +ERROR =3D !Failed to import table line 1 field col2 'int' expected in '2.0= 3' +MAPI =3D (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 QUERY =3D COPY 1 RECORDS INTO my_copytest FROM stdin USING DELIMITERS '|',= '\n' NULL as ''; 223|2||aaa|b -ERROR =3D !Failed to import table line 1 field 4 'varchar(1)' expected in = 'aaa' -MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +ERROR =3D !Failed to import table line 1 field col4 'varchar(1)' expected = in 'aaa' +MAPI =3D (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 QUERY =3D COPY 1 RECORDS INTO my_copytest FROM stdin USING DELIMITERS '|',= '\n' NULL as ''; 223|3||a|bbb -ERROR =3D !Failed to import table line 1 field 5 'varchar(1)' expected in = 'bbb' +ERROR =3D !Failed to import table line 1 field col5 'varchar(1)' expected = in 'bbb' =20 =20 # 09:34:56 > =20 diff --git a/sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err b= /sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err --- a/sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err +++ b/sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err @@ -82,11 +82,11 @@ stderr of test 'varchar.SF-2471371` in d MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 QUERY =3D COPY 1 RECORDS INTO myvar_test FROM stdin USING DELIMITERS '|','= \n' NULL as ''; a|b2b -ERROR =3D !Failed to import table line 1 field 2 'varchar(2)' expected in = 'b2b' -MAPI =3D (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395 +ERROR =3D !Failed to import table line 1 field col2 'varchar(2)' expected = in 'b2b' +MAPI =3D (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 QUERY
MonetDB: protocol - Merge with default (breaks mclient, todo: fix).
Changeset: 57a245b144e6 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57a245b144e6 Added Files: ChangeLog clients/examples/perl/Makefile.ag clients/examples/perl/client.pl clients/examples/perl/countries.sql clients/examples/perl/dbitest_extensive.pl clients/examples/perl/dbitest_small.pl clients/examples/perl/malsample.pl clients/examples/perl/smack00.pl clients/examples/perl/smack01.pl clients/examples/perl/sqlsample.pl monetdb5/mal/Tests/tst023.malC monetdb5/mal/Tests/tst023.stable.err monetdb5/mal/Tests/tst023.stable.out monetdb5/optimizer/opt_emptybind.c monetdb5/optimizer/opt_emptybind.h monetdb5/optimizer/opt_jit.c monetdb5/optimizer/opt_jit.h sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.sql sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.err sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.sql sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.err sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.sql sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.err sql/test/BugTracker-2016/Tests/concat_2_integers.Bug-4058.stable.out sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.sql sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.err sql/test/BugTracker-2016/Tests/create_merge_table_withdata.Bug-4041.stable.out sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.sql sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.err sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out sql/test/BugTracker-2016/Tests/simpletest.sql sql/test/BugTracker-2016/Tests/simpletest.stable.err sql/test/BugTracker-2016/Tests/simpletest.stable.out sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.sql sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.err sql/test/BugTracker-2016/Tests/timestamp_with_tz_fromstr.Bug-4019.stable.out sql/test/Tests/bincopycollist-prepare.bat sql/test/Tests/bincopycollist-prepare.sh sql/test/Tests/bincopycollist-prepare.stable.err sql/test/Tests/bincopycollist-prepare.stable.out sql/test/Tests/bincopycollist.reqtests sql/test/Tests/bincopycollist.sql.in sql/test/Tests/bincopycollist.stable.err sql/test/Tests/bincopycollist.stable.out sql/test/Tests/bincopyint.bin Removed Files: clients/perl/DBD/MANIFEST clients/perl/DBD/MANIFEST.SKIP clients/perl/DBD/Makefile.PL clients/perl/DBD/Makefile.ag clients/perl/DBD/README clients/perl/DBD/monetdb.pm clients/perl/DBD/monetdb/GetInfo.pm clients/perl/DBD/monetdb/Makefile.ag clients/perl/DBD/monetdb/TypeInfo.pm clients/perl/DBD/t/01base.t clients/perl/DBD/t/02ads.t clients/perl/DBD/t/02cxn.t clients/perl/DBD/t/05gi.t clients/perl/DBD/t/06ti.t clients/perl/DBD/t/07q.t clients/perl/DBD/t/11prep.t clients/perl/DBD/t/12bind.t clients/perl/DBD/t/12ins_b.t clients/perl/DBD/t/12ins_q.t clients/perl/DBD/t/13count.t clients/perl/DBD/t/14rows.t clients/perl/DBD/t/18bc.t clients/perl/DBD/t/21sth.t clients/perl/DBD/t/23null.t clients/perl/DBD/t/31txn.t clients/perl/DBD/t/41ddtbl.t clients/perl/DBD/t/42ddcol.t clients/perl/DBD/t/43ddpk.t clients/perl/DBD/t/44ddfk.t clients/perl/DBD/t/51qi.t clients/perl/DBD/t/75mil.t clients/perl/DBD/t/DBD_TEST.pm clients/perl/Makefile.ag clients/perl/Mapi.pm clients/perl/MonetDB-CLI-MapiPP/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MANIFEST.SKIP clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.PL clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/Makefile.ag clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/README clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/00use.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/02cxn.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/t/75mil.t clients/perl/MonetDB-CLI-MapiPP/MonetDB/Makefile.ag clients/perl/MonetDB-CLI/Makefile.ag clients/perl/MonetDB-CLI/MonetDB/CLI.pm clients/perl/MonetDB-CLI/MonetDB/MANIFEST
MonetDB: protocol - Merge with default.
Changeset: fc5d1f1dd5ed for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc5d1f1dd5ed Added Files: buildtools/autogen/autogen/filesplit.py sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit sql/benchmarks/tpch/Tests/02-plan.stable.out.32bit sql/benchmarks/tpch/Tests/13-plan.stable.out.32bit sql/benchmarks/tpch/Tests/16-plan.stable.out.32bit sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.err.32bit sql/test/BugTracker-2010/Tests/offset_limited_32bit.SF-2950579.stable.out.32bit sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.sql sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.stable.err sql/test/BugTracker-2016/Tests/innerjoin-leftjoin-or.Bug-4049.stable.out sql/test/lateral/Tests/All sql/test/lateral/Tests/lateral.sql sql/test/lateral/Tests/lateral.stable.err sql/test/lateral/Tests/lateral.stable.out sql/test/orderidx/Tests/simpletable.stable.out.32bit sql/test/orderidx/Tests/smalltable.stable.out.32bit sql/test/pg_regress/Tests/oid.stable.out.32bit sql/test/pg_regress/Tests/without_oid.stable.out.32bit Removed Files: sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.out.32bit sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out.32bit sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out.32bit sql/test/Dependencies/Tests/Dependencies.stable.out.int128 Modified Files: buildtools/autogen/autogen/am.py buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/odbc/driver/SQLGetFunctions.c common/stream/stream.c configure.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_calc.h gdk/gdk_cross.c gdk/gdk_heap.c gdk/gdk_storage.c gdk/gdk_unique.c gdk/gdk_utils.c java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single monetdb5/mal/mal_debugger.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_linker.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_runtime.c monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/uuid.c monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/mkey.c monetdb5/modules/mal/mkey.h monetdb5/modules/mal/tablet.c monetdb5/optimizer/Tests/manifold2.stable.out.single sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
MonetDB: protocol - merge with default
Changeset: edcb9d8a2c8f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edcb9d8a2c8f
Removed Files:
monetdb5/modules/mal/Tests/zorder.malC
monetdb5/modules/mal/Tests/zorder.stable.err
monetdb5/modules/mal/Tests/zorder.stable.out
monetdb5/modules/mal/zorder.c
monetdb5/modules/mal/zorder.h
monetdb5/modules/mal/zorder.mal
sql/scripts/24_zorder.sql
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/odbc/driver/README
clients/odbc/driver/SQLBindParameter.c
clients/odbc/driver/SQLBulkOperations.c
clients/odbc/driver/SQLCopyDesc.c
clients/odbc/driver/SQLDescribeParam.c
clients/odbc/driver/SQLEndTran.c
clients/odbc/driver/SQLExtendedFetch.c
clients/odbc/driver/SQLFetchScroll.c
clients/odbc/driver/SQLGetEnvAttr.c
clients/odbc/driver/SQLNumParams.c
clients/odbc/driver/SQLSetDescRec.c
clients/odbc/driver/SQLSetEnvAttr.c
configure.ag
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
monetdb5/ChangeLog
monetdb5/mal/mal.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_module.h
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/opt_profiler.c
rpm.mk.in
sql/ChangeLog
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/scripts/Makefile.ag
sql/test/BugTracker-2016/Tests/All
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/pg_regress/Tests/strings.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
Branch: protocol
Log Message:
merge with default
diffs (truncated from 5860 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -897,12 +897,6 @@
}
"Entry"
{
-"MsmKey" = "8:_EC56B031A65A44BCA049E43F5A7641C4"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_F0AD495DD01A481B8FDB22499521AFB7"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -939,12 +933,6 @@
}
"Entry"
{
-"MsmKey" = "8:_F64E69D474DA4F6A89A1B014F77E4669"
-"OwnerKey" = "8:_UNDEFINED"
-"MsmSig" = "8:_UNDEFINED"
-}
-"Entry"
-{
"MsmKey" = "8:_F827A21B394243CA9A2DA27D42DA0C93"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3964,26 +3952,6 @@
