Changeset: 88cd3b034321 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88cd3b034321 Modified Files: clients/Tests/MAL-signatures.stable.out Branch: leftmart Log Message:
conflict resolved diffs (21 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -39975,17 +39975,6 @@ command bat.getSize(b:bat[:any_1]):lng address BKCgetSize; comment Calculate the actual size of the BAT descriptor, heaps, hashes and imprint indices in bytes rounded to the memory page size (see bbp.getPageSize()). -<<<<<<< local -pattern bat.hasorderidx(bv:bat[:any_1]):bit -address OIDXhasorderidx; -comment Return true if order index exists - -======= -command bat.imprintsize(b:bat[:hge]):lng -address CMDBATimprintsize; -command bat.imprints(b:bat[:hge]):void -address CMDBATimprints; ->>>>>>> other command bat.imprintsize(b:bat[:dbl]):lng address CMDBATimprintsize; comment Return the storage size of the imprints index structure. _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
