Changeset: 7ad65e8da17e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ad65e8da17e
Added Files:
        debian/libmonetdb9.install
        monetdb5/modules/kernel/group.c
        monetdb5/modules/kernel/group.h
        monetdb5/modules/kernel/group.mal
Removed Files:
        buildtools/ChangeLog.Oct2012
        clients/ChangeLog.Oct2012
        debian/libmonetdb8.install
        gdk/ChangeLog.Oct2012
        geom/ChangeLog.Oct2012
        java/ChangeLog.Oct2012
        monetdb5/ChangeLog.Oct2012
        monetdb5/modules/kernel/group.mx
        sql/ChangeLog.Oct2012
        testing/ChangeLog.Oct2012
        tools/merovingian/ChangeLog.Oct2012
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/ChangeLog-Archive
        clients/ChangeLog.Feb2013
        clients/Tests/exports.stable.out
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        clients/python2/monetdb/mapi.py
        clients/python2/setup.py
        clients/python3/setup.py
        configure.ag
        debian/changelog
        debian/control
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_calc.h
        gdk/gdk_group.c
        gdk/gdk_heap.c
        gdk/gdk_search.c
        gdk/gdk_search.h
        gdk/libbat.rc
        java/ChangeLog-Archive
        java/ChangeLog.Feb2013
        libversions
        monetdb5/ChangeLog-Archive
        monetdb5/ChangeLog.Feb2013
        monetdb5/extras/rdf/rdf_shredder.mx
        monetdb5/mal/Tests/All
        monetdb5/mal/Tests/tst1500.mal
        monetdb5/mal/Tests/tst1500.stable.out
        monetdb5/mal/Tests/tst1503.mal
        monetdb5/mal/Tests/tst1503.stable.out
        monetdb5/mal/Tests/tst870.mal
        monetdb5/mal/Tests/tst870.stable.out
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_resource.c
        monetdb5/mal/mal_resource.h
        monetdb5/modules/kernel/Makefile.ag
        monetdb5/modules/kernel/aggr.c
        monetdb5/modules/kernel/aggr.mal
        monetdb5/modules/kernel/aggr.mal.sh
        monetdb5/modules/kernel/algebra.mx
        monetdb5/modules/mal/mat.c
        monetdb5/modules/mal/mat.h
        monetdb5/modules/mal/mat.mal
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/pcre.mal
        monetdb5/optimizer/Tests/All
        monetdb5/optimizer/Tests/tst4631.stable.out
        monetdb5/optimizer/Tests/tst4730.stable.out
        monetdb5/optimizer/opt_dictionary.c
        monetdb5/optimizer/opt_mergetable.c
        monetdb5/optimizer/opt_origin.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_support.c
        monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.mal
        
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.stable.out
        monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/All
        monetdb5/tools/libmonetdb5.rc
        sql/backends/monet5/sql.mx
        sql/backends/monet5/sql_gencode.c
        sql/scripts/30_rdf.sql
        sql/server/rel_optimizer.c
        sql/test/BugTracker-2009/Tests/AVG_ReturnsNoLines.SF-2596084.stable.out
        sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
        
sql/test/BugTracker-2011/Tests/view_avg_incorrect_result.Bug-2790.stable.out
        testing/ChangeLog-Archive
        testing/ChangeLog.Feb2013
        tools/merovingian/ChangeLog-Archive
        tools/merovingian/ChangeLog.Feb2013
        vertoo.data
Branch: sciql
Log Message:

merged from default


diffs (truncated from 6524 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -513,3 +513,5 @@ 0ef42179e99bbd8450d9993cf419fcbed96cf61c
 14b7be52b2212bf3aeb51edecbaee020554b3158 Oct2012_SP2_release
 0d23123db0a3fd8564564c46789e8e549320c77b Oct2012_9
 1f74df406780bccca94e6128c6c62a0b101fc847 Oct2012_SP3_release
+693187b90b57a610779caa942efe7514372125ee Feb2013_1
+23894afae1679eb37e6866a793ba00782c4b0804 Feb2013_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -27,7 +27,7 @@ Vendor: MonetDB BV <[email protected]>
 Group: Applications/Databases
 License: MPL - http://www.monetdb.org/Legal/MonetDBLicense
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Oct2012-SP3/%{name}-%{version}.tar.bz2
+Source: 
http://dev.monetdb.org/downloads/sources/Feb2013/%{name}-%{version}.tar.bz2
 
 BuildRequires: bison
 BuildRequires: bzip2-devel
@@ -725,6 +725,68 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmonet
 rm -fr $RPM_BUILD_ROOT
 
 %changelog
+* Tue Feb 12 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- Rebuilt.
+
+* Thu Jan 17 2013 Stefan Manegold <[email protected]> - 11.15.1-20130212
+- testing:
+enabled "top-level" Mtest.py
+So far, while Mtest.py could be called in any subdirectory of the MonetDB
+source tree (and could then run all tests in the entire sub-tree),
+it was not possible to call Mtest.py in the top-level MonetDB source
+directory to run all tests.  Instead, to run all tests, Mtest.py had to
+be called at least 4 times, once in each of these directories: "clients",
+"monetdb5", "sql", "geom".
+Now, it is possible to call Mtest.py once in the top-level MonetDB source
+directory to run all tests in one go.
+The behaviour of calling Mtest.py in any subdirectory, including the
+four mentioned above, did not changed, other than that now obsolete
+command line options "-p / --package <package>" and "-5 / --monetdb5"
+have been removed.
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- clients: Mapi protocol v8 support was removed from all client drivers.  
Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+- clients: The tool mnc was removed from installations
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- java: merocontrol was changed to return server URIs, and lastStop time.
+  Connections and dbpath were removed.
+- java: Mapi protocol v8 support was removed from MapiSocket.  Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: Upgrade support for dbfarms from Mar2011 and Aug2011 was dropped
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now uses a more condensed output, to cater for 
the uris
+  being shown, and prints how long a database is stopped, or how long
+  ago it crashed
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now prints the connection uri for each database,
+  when available.  The connections and database path properties have
+  been dropped.
+
+* Tue Jan 15 2013 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- merovingian: monetdb status now prints last crash date only if the database 
has
+  not been started since.
+
+* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- monetdb5: mserver5: The --dbname and --dbfarm options have been replaced by 
the
+  single --dbpath option.
+
+* Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- clients: msqldump: Implmented an option (--table/-t) to dump a single table.
+- clients: Changed msqdump's trace option to be in line with mclient.  In both
+  cases, the long option is --Xdebug and the short option is -X.
+
+* Tue Jan 15 2013 Martin Kersten <[email protected]> - 11.15.1-20130212
+- monetdb5: The scheduler of mserver5 was changed to use a fixed set of 
workers to
+  perform the work for all connected clients.  Previously, each client
+  connection had its own set of workers, easily causing resource problems
+  upon multiple connections to the server.
+
 * Tue Jan 15 2013 Sjoerd Mullender <[email protected]> - 11.13.9-20130115
 - Rebuilt.
 
diff --git a/buildtools/ChangeLog.Oct2012 b/buildtools/ChangeLog.Oct2012
deleted file mode 100644
--- a/buildtools/ChangeLog.Oct2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for buildtools
-# This file is updated with Maddlog
-
diff --git a/clients/ChangeLog-Archive b/clients/ChangeLog-Archive
--- a/clients/ChangeLog-Archive
+++ b/clients/ChangeLog-Archive
@@ -1,6 +1,16 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Sat Dec  1 2012 Fabian Groffen <[email protected]> - 11.15.1-20130212
+- Mapi protocol v8 support was removed from all client drivers.  Protocol
+  v8 has not been used by the servers any more since Apr2012 release
+- The tool mnc was removed from installations
+
+* Wed Nov  7 2012 Sjoerd Mullender <[email protected]> - 11.15.1-20130212
+- msqldump: Implmented an option (--table/-t) to dump a single table.
+- Changed msqdump's trace option to be in line with mclient.  In both
+  cases, the long option is --Xdebug and the short option is -X.
+
 * Tue Sep  4 2012 Fabian Groffen <[email protected]> - 11.13.1-20121010
 - mclient now accepts URIs as database to connect to.
 
diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013
--- a/clients/ChangeLog.Feb2013
+++ b/clients/ChangeLog.Feb2013
@@ -1,13 +1,3 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
-* Sat Dec  1 2012 Fabian Groffen <[email protected]>
-- Mapi protocol v8 support was removed from all client drivers.  Protocol
-  v8 has not been used by the servers any more since Apr2012 release
-- The tool mnc was removed from installations
-
-* Wed Nov  7 2012 Sjoerd Mullender <[email protected]>
-- msqldump: Implmented an option (--table/-t) to dump a single table.
-- Changed msqdump's trace option to be in line with mclient.  In both
-  cases, the long option is --Xdebug and the short option is -X.
-
diff --git a/clients/ChangeLog.Oct2012 b/clients/ChangeLog.Oct2012
deleted file mode 100644
--- a/clients/ChangeLog.Oct2012
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for clients
-# This file is updated with Maddlog
-
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
@@ -121,7 +121,7 @@ int BATgetaccess(BAT *b);
 PROPrec *BATgetprop(BAT *b, int idx);
 gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *g, 
BAT *e, BAT *h);
 const char *BATgroupaggrinit(const BAT *b, const BAT *g, const BAT *e, const 
BAT *s, oid *minp, oid *maxp, BUN *ngrpp, BUN *startp, BUN *endp, BUN *cntp, 
const oid **candp, const oid **candendp);
-BAT *BATgroupavg(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int 
abort_on_error);
+gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, 
int tp, int skip_nils, int abort_on_error);
 BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int 
abort_on_error);
 BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int 
abort_on_error);
 BAT *BATgroupmedian(BAT *b, BAT *g, BAT *e, BAT *s, int tp, int skip_nils, int 
abort_on_error);
@@ -607,8 +607,10 @@ char *mapi_unquote(char *msg);
 MapiMsg mapi_virtual_result(MapiHdl hdl, int columns, const char 
**columnnames, const char **columntypes, const int *columnlengths, int 
tuplecount, const char ***tuples);
 
 # monetdb5
-str AGGRavg2_dbl(bat *retval, bat *bid, bat *eid);
-str AGGRavg3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
+str AGGRavg12_dbl(bat *retval, bat *bid, bat *eid);
+str AGGRavg13_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
+str AGGRavg22_dbl(bat *retval1, bat *retval2, bat *bid, bat *eid);
+str AGGRavg23_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat *eid);
 str AGGRcount2(bat *retval, bat *bid, bat *eid, bit *ignorenils);
 str AGGRcount2nils(bat *retval, bat *bid, bat *eid);
 str AGGRcount2nonils(bat *retval, bat *bid, bat *eid);
@@ -640,8 +642,10 @@ str AGGRstdev2_dbl(bat *retval, bat *bid
 str AGGRstdev3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
 str AGGRstdevp2_dbl(bat *retval, bat *bid, bat *eid);
 str AGGRstdevp3_dbl(bat *retval, bat *bid, bat *gid, bat *eid);
-str AGGRsubavg_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, 
bit *abort_on_error);
-str AGGRsubavgcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, 
bit *skip_nils, bit *abort_on_error);
+str AGGRsubavg1_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils, 
bit *abort_on_error);
+str AGGRsubavg1cand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, 
bit *skip_nils, bit *abort_on_error);
+str AGGRsubavg2_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat *eid, 
bit *skip_nils, bit *abort_on_error);
+str AGGRsubavg2cand_dbl(bat *retval1, bat *retval2, bat *bid, bat *gid, bat 
*eid, bat *sid, bit *skip_nils, bit *abort_on_error);
 str AGGRsubcount(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
 str AGGRsubcountcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit 
*skip_nils);
 str AGGRsubmax(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
@@ -1388,8 +1392,6 @@ str CSTrelease(Client cntxt, MalBlkPtr m
 str CSTreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CSTtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str CSTtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-int CTrefine(BAT **res, BAT *b, BAT *a);
-int CTrefine_rev(BAT **res, BAT *b, BAT *a);
 str CemptySet(int *k, int *bid);
 str DICTbind(int *idx, int *val, str *nme);
 str DICTcompress(int *idx, str *nme, int *bid);
@@ -1406,88 +1408,10 @@ str FCTgetOwners(int *ret);
 str FCTgetPlants(int *ret, int *ret2);
 str FCTsetLocation(int *ret, str *loc);
 str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str GRPaggr_count(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPavg_bte(int *ret, int *bid, int *eid);
-str GRPavg_dbl(int *ret, int *bid, int *eid);
-str GRPavg_flt(int *ret, int *bid, int *eid);
-str GRPavg_int(int *ret, int *bid, int *eid);
-str GRPavg_lng(int *ret, int *bid, int *eid);
-str GRPavg_oid(int *ret, int *bid, int *eid);
-str GRPavg_sht(int *ret, int *bid, int *eid);
-str GRPavg_wrd(int *ret, int *bid, int *eid);
-str GRPderive(int *hid, int *mid, int *ct_histoid, int *ct_mapid, int *bid);
-str GRPgroup(int *rethisto, int *retbid, int *bid);
-str GRPmax(int *retval, int *bid, int *eid);
-str GRPmin(int *retval, int *bid, int *eid);
 str GRPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
-str GRPprod_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_bte_sht(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_bte_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_dbl_dbl(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_flt_dbl(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_flt_flt(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_int_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_int_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_int_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_lng_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_oid_oid(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_sht_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_sht_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_sht_sht(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_sht_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_wrd_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPprod_wrd_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPrefine(int *retid, int *bid, int *aid);
-str GRPrefine_rev(int *retid, int *bid, int *aid);
-str GRPsize(int *retval, int *bid, int *eid);
-str GRPslidingsum_bte(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_dbl(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_flt(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_int(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_lng(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_oid(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_sht(int *retval, int *bid, int *size, int *shift);
-str GRPslidingsum_wrd(int *retval, int *bid, int *size, int *shift);
 str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, bat *bid);
 str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid);
 str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid, bat 
*eid, bat *hid);
-str GRPsum_bte_bte(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_bte_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_bte_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_bte_sht(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_bte_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_dbl_dbl(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_flt_dbl(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_flt_flt(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_int_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_int_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_int_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_lng_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_oid_oid(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_sht_int(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_sht_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_sht_sht(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_sht_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_wrd_lng(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPsum_wrd_wrd(int *retval, int *bid, int *eid, bit *ignore_nils);
-str GRPvar_bte(int *ret, int *bid, int *eid);
-str GRPvar_dbl(int *ret, int *bid, int *eid);
-str GRPvar_flt(int *ret, int *bid, int *eid);
-str GRPvar_int(int *ret, int *bid, int *eid);
-str GRPvar_lng(int *ret, int *bid, int *eid);
-str GRPvar_oid(int *ret, int *bid, int *eid);
-str GRPvar_sht(int *ret, int *bid, int *eid);
-str GRPvar_wrd(int *ret, int *bid, int *eid);
-str GRPwindowsum_bte(int *retval, int *bid, int *size);
-str GRPwindowsum_dbl(int *retval, int *bid, int *size);
-str GRPwindowsum_flt(int *retval, int *bid, int *size);
-str GRPwindowsum_int(int *retval, int *bid, int *size);
-str GRPwindowsum_lng(int *retval, int *bid, int *size);
-str GRPwindowsum_oid(int *retval, int *bid, int *size);
-str GRPwindowsum_sht(int *retval, int *bid, int *size);
-str GRPwindowsum_wrd(int *retval, int *bid, int *size);
 str IDentifier(str *retval, str *in);
 int IDfromString(str src, int *len, str *retval);
 str IDprelude(void);
@@ -1630,8 +1554,6 @@ str MATpackSlice(Client cntxt, MalBlkPtr
 str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MATprint(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MATproject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MATrefine(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str MATrefineReverse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str MATsortReverseTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr 
pci);
 str MATsortTail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str MBMmix(int *ret, int *batid);
@@ -1925,6 +1847,7 @@ str PCRElike_select_pcre(int *ret, int *
 str PCRElike_uselect_pcre(int *ret, int *b, str *pat, str *esc);
 str PCRElikesubselect1(bat *ret, bat *bid, str *pat, str *esc, bit 
*caseignore, bit *anti);
 str PCRElikesubselect2(bat *ret, bat *bid, bat *sid, str *pat, str *esc, bit 
*caseignore, bit *anti);
+str PCRElikesubselect3(bat *ret, bat *bid, str *pat, str *esc, bit *anti);
 str PCREmatch(bit *ret, str *val, str *pat);
 str PCREnotilike2(bit *ret, str *s, str *pat);
 str PCREnotilike3(bit *ret, str *s, str *pat, str *esc);
@@ -2575,7 +2498,6 @@ str dense_rank_grpRef;
 int depositBox(Box box, str name, int type, ValPtr val);
 str depositRef;
 void deriveModule(Module scope, str nme);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to