Changeset: 45e83f14d518 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45e83f14d518
Added Files:
        clients/Tests/MAL-signatures.malC
        clients/Tests/MAL-signatures.stable.err
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.Windows
        clients/Tests/SQL-dump.sql
        clients/Tests/SQL-dump.stable.err
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.32bit
        clients/Tests/SQL-dump.stable.out.oid32
        clients/Tests/SQL-dump.timeout
        clients/python2/ChangeLog
        clients/python3/ChangeLog
        monetdb5/mal/mal_private.h
        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-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-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-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-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-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-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-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-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/08-plan.reqtests
        sql/benchmarks/ssbm/Tests/08-plan.stable.err
        sql/benchmarks/ssbm/Tests/08-plan.stable.out
        sql/benchmarks/ssbm/Tests/09-explain.SQL.py.src
        sql/benchmarks/ssbm/Tests/09-explain.reqtests
        sql/benchmarks/ssbm/Tests/09-explain.stable.err
        sql/benchmarks/ssbm/Tests/09-explain.stable.out
        sql/benchmarks/ssbm/Tests/09-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/09-plan.reqtests
        sql/benchmarks/ssbm/Tests/09-plan.stable.err
        sql/benchmarks/ssbm/Tests/09-plan.stable.out
        sql/benchmarks/ssbm/Tests/10-explain.SQL.py.src
        sql/benchmarks/ssbm/Tests/10-explain.reqtests
        sql/benchmarks/ssbm/Tests/10-explain.stable.err
        sql/benchmarks/ssbm/Tests/10-explain.stable.out
        sql/benchmarks/ssbm/Tests/10-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/10-plan.reqtests
        sql/benchmarks/ssbm/Tests/10-plan.stable.err
        sql/benchmarks/ssbm/Tests/10-plan.stable.out
        sql/benchmarks/ssbm/Tests/11-explain.SQL.py.src
        sql/benchmarks/ssbm/Tests/11-explain.reqtests
        sql/benchmarks/ssbm/Tests/11-explain.stable.err
        sql/benchmarks/ssbm/Tests/11-explain.stable.out
        sql/benchmarks/ssbm/Tests/11-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/11-plan.reqtests
        sql/benchmarks/ssbm/Tests/11-plan.stable.err
        sql/benchmarks/ssbm/Tests/11-plan.stable.out
        sql/benchmarks/ssbm/Tests/12-explain.SQL.py.src
        sql/benchmarks/ssbm/Tests/12-explain.reqtests
        sql/benchmarks/ssbm/Tests/12-explain.stable.err
        sql/benchmarks/ssbm/Tests/12-explain.stable.out
        sql/benchmarks/ssbm/Tests/12-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/12-plan.reqtests
        sql/benchmarks/ssbm/Tests/12-plan.stable.err
        sql/benchmarks/ssbm/Tests/12-plan.stable.out
        sql/benchmarks/ssbm/Tests/13-explain.SQL.py.src
        sql/benchmarks/ssbm/Tests/13-explain.reqtests
        sql/benchmarks/ssbm/Tests/13-explain.stable.err
        sql/benchmarks/ssbm/Tests/13-explain.stable.out
        sql/benchmarks/ssbm/Tests/13-plan.SQL.py.src
        sql/benchmarks/ssbm/Tests/13-plan.reqtests
        sql/benchmarks/ssbm/Tests/13-plan.stable.err
        sql/benchmarks/ssbm/Tests/13-plan.stable.out
        sql/benchmarks/ssbm/Tests/explain.SQL.py
        sql/benchmarks/ssbm/Tests/plan.SQL.py
        sql/benchmarks/tpch/Tests/01-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/01-explain.reqtests
        sql/benchmarks/tpch/Tests/01-explain.stable.err
        sql/benchmarks/tpch/Tests/01-explain.stable.out
        sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/01-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/01-plan.reqtests
        sql/benchmarks/tpch/Tests/01-plan.stable.err
        sql/benchmarks/tpch/Tests/01-plan.stable.out
        sql/benchmarks/tpch/Tests/02-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/02-explain.reqtests
        sql/benchmarks/tpch/Tests/02-explain.stable.err
        sql/benchmarks/tpch/Tests/02-explain.stable.out
        sql/benchmarks/tpch/Tests/02-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/02-plan.reqtests
        sql/benchmarks/tpch/Tests/02-plan.stable.err
        sql/benchmarks/tpch/Tests/02-plan.stable.out
        sql/benchmarks/tpch/Tests/03-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/03-explain.reqtests
        sql/benchmarks/tpch/Tests/03-explain.stable.err
        sql/benchmarks/tpch/Tests/03-explain.stable.out
        sql/benchmarks/tpch/Tests/03-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/03-plan.reqtests
        sql/benchmarks/tpch/Tests/03-plan.stable.err
        sql/benchmarks/tpch/Tests/03-plan.stable.out
        sql/benchmarks/tpch/Tests/04-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/04-explain.reqtests
        sql/benchmarks/tpch/Tests/04-explain.stable.err
        sql/benchmarks/tpch/Tests/04-explain.stable.out
        sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/04-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/04-plan.reqtests
        sql/benchmarks/tpch/Tests/04-plan.stable.err
        sql/benchmarks/tpch/Tests/04-plan.stable.out
        sql/benchmarks/tpch/Tests/05-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/05-explain.reqtests
        sql/benchmarks/tpch/Tests/05-explain.stable.err
        sql/benchmarks/tpch/Tests/05-explain.stable.out
        sql/benchmarks/tpch/Tests/05-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/05-plan.reqtests
        sql/benchmarks/tpch/Tests/05-plan.stable.err
        sql/benchmarks/tpch/Tests/05-plan.stable.out
        sql/benchmarks/tpch/Tests/06-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/06-explain.reqtests
        sql/benchmarks/tpch/Tests/06-explain.stable.err
        sql/benchmarks/tpch/Tests/06-explain.stable.out
        sql/benchmarks/tpch/Tests/06-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/06-plan.reqtests
        sql/benchmarks/tpch/Tests/06-plan.stable.err
        sql/benchmarks/tpch/Tests/06-plan.stable.out
        sql/benchmarks/tpch/Tests/07-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/07-explain.reqtests
        sql/benchmarks/tpch/Tests/07-explain.stable.err
        sql/benchmarks/tpch/Tests/07-explain.stable.out
        sql/benchmarks/tpch/Tests/07-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/07-plan.reqtests
        sql/benchmarks/tpch/Tests/07-plan.stable.err
        sql/benchmarks/tpch/Tests/07-plan.stable.out
        sql/benchmarks/tpch/Tests/08-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/08-explain.reqtests
        sql/benchmarks/tpch/Tests/08-explain.stable.err
        sql/benchmarks/tpch/Tests/08-explain.stable.out
        sql/benchmarks/tpch/Tests/08-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/08-plan.reqtests
        sql/benchmarks/tpch/Tests/08-plan.stable.err
        sql/benchmarks/tpch/Tests/08-plan.stable.out
        sql/benchmarks/tpch/Tests/09-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/09-explain.reqtests
        sql/benchmarks/tpch/Tests/09-explain.stable.err
        sql/benchmarks/tpch/Tests/09-explain.stable.out
        sql/benchmarks/tpch/Tests/09-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/09-plan.reqtests
        sql/benchmarks/tpch/Tests/09-plan.stable.err
        sql/benchmarks/tpch/Tests/09-plan.stable.out
        sql/benchmarks/tpch/Tests/10-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/10-explain.reqtests
        sql/benchmarks/tpch/Tests/10-explain.stable.err
        sql/benchmarks/tpch/Tests/10-explain.stable.out
        sql/benchmarks/tpch/Tests/10-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/10-plan.reqtests
        sql/benchmarks/tpch/Tests/10-plan.stable.err
        sql/benchmarks/tpch/Tests/10-plan.stable.out
        sql/benchmarks/tpch/Tests/11-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/11-explain.reqtests
        sql/benchmarks/tpch/Tests/11-explain.stable.err
        sql/benchmarks/tpch/Tests/11-explain.stable.out
        sql/benchmarks/tpch/Tests/11-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/11-plan.reqtests
        sql/benchmarks/tpch/Tests/11-plan.stable.err
        sql/benchmarks/tpch/Tests/11-plan.stable.out
        sql/benchmarks/tpch/Tests/12-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/12-explain.reqtests
        sql/benchmarks/tpch/Tests/12-explain.stable.err
        sql/benchmarks/tpch/Tests/12-explain.stable.out
        sql/benchmarks/tpch/Tests/12-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/12-plan.reqtests
        sql/benchmarks/tpch/Tests/12-plan.stable.err
        sql/benchmarks/tpch/Tests/12-plan.stable.out
        sql/benchmarks/tpch/Tests/13-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/13-explain.reqtests
        sql/benchmarks/tpch/Tests/13-explain.stable.err
        sql/benchmarks/tpch/Tests/13-explain.stable.out
        sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/13-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/13-plan.reqtests
        sql/benchmarks/tpch/Tests/13-plan.stable.err
        sql/benchmarks/tpch/Tests/13-plan.stable.out
        sql/benchmarks/tpch/Tests/14-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/14-explain.reqtests
        sql/benchmarks/tpch/Tests/14-explain.stable.err
        sql/benchmarks/tpch/Tests/14-explain.stable.out
        sql/benchmarks/tpch/Tests/14-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/14-plan.reqtests
        sql/benchmarks/tpch/Tests/14-plan.stable.err
        sql/benchmarks/tpch/Tests/14-plan.stable.out
        sql/benchmarks/tpch/Tests/15-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/15-explain.reqtests
        sql/benchmarks/tpch/Tests/15-explain.stable.err
        sql/benchmarks/tpch/Tests/15-explain.stable.out
        sql/benchmarks/tpch/Tests/15-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/15-plan.reqtests
        sql/benchmarks/tpch/Tests/15-plan.stable.err
        sql/benchmarks/tpch/Tests/15-plan.stable.out
        sql/benchmarks/tpch/Tests/16-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/16-explain.reqtests
        sql/benchmarks/tpch/Tests/16-explain.stable.err
        sql/benchmarks/tpch/Tests/16-explain.stable.out
        sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/16-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/16-plan.reqtests
        sql/benchmarks/tpch/Tests/16-plan.stable.err
        sql/benchmarks/tpch/Tests/16-plan.stable.out
        sql/benchmarks/tpch/Tests/17-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/17-explain.reqtests
        sql/benchmarks/tpch/Tests/17-explain.stable.err
        sql/benchmarks/tpch/Tests/17-explain.stable.out
        sql/benchmarks/tpch/Tests/17-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/17-plan.reqtests
        sql/benchmarks/tpch/Tests/17-plan.stable.err
        sql/benchmarks/tpch/Tests/17-plan.stable.out
        sql/benchmarks/tpch/Tests/18-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/18-explain.reqtests
        sql/benchmarks/tpch/Tests/18-explain.stable.err
        sql/benchmarks/tpch/Tests/18-explain.stable.out
        sql/benchmarks/tpch/Tests/18-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/18-plan.reqtests
        sql/benchmarks/tpch/Tests/18-plan.stable.err
        sql/benchmarks/tpch/Tests/18-plan.stable.out
        sql/benchmarks/tpch/Tests/19-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/19-explain.reqtests
        sql/benchmarks/tpch/Tests/19-explain.stable.err
        sql/benchmarks/tpch/Tests/19-explain.stable.out
        sql/benchmarks/tpch/Tests/19-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/19-plan.reqtests
        sql/benchmarks/tpch/Tests/19-plan.stable.err
        sql/benchmarks/tpch/Tests/19-plan.stable.out
        sql/benchmarks/tpch/Tests/20-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/20-explain.reqtests
        sql/benchmarks/tpch/Tests/20-explain.stable.err
        sql/benchmarks/tpch/Tests/20-explain.stable.out
        sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/20-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/20-plan.reqtests
        sql/benchmarks/tpch/Tests/20-plan.stable.err
        sql/benchmarks/tpch/Tests/20-plan.stable.out
        sql/benchmarks/tpch/Tests/21-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/21-explain.reqtests
        sql/benchmarks/tpch/Tests/21-explain.stable.err
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/21-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/21-plan.reqtests
        sql/benchmarks/tpch/Tests/21-plan.stable.err
        sql/benchmarks/tpch/Tests/21-plan.stable.out
        sql/benchmarks/tpch/Tests/22-explain.SQL.py.src
        sql/benchmarks/tpch/Tests/22-explain.reqtests
        sql/benchmarks/tpch/Tests/22-explain.stable.err
        sql/benchmarks/tpch/Tests/22-explain.stable.out
        sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
        sql/benchmarks/tpch/Tests/22-plan.SQL.py.src
        sql/benchmarks/tpch/Tests/22-plan.reqtests
        sql/benchmarks/tpch/Tests/22-plan.stable.err
        sql/benchmarks/tpch/Tests/22-plan.stable.out
        sql/benchmarks/tpch/Tests/explain.SQL.py
        sql/benchmarks/tpch/Tests/plan.SQL.py
        sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.sql
        sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.err
        sql/test/BugTracker-2013/Tests/check-constraint.Bug-3335.stable.out
        
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.sql
        
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.err
        
sql/test/BugTracker-2013/Tests/crash_after_creation_of_unique_key.Bug-3363.stable.out
Removed Files:
        clients/python2/CHANGELOG
        clients/python3/CHANGELOG
        sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows.32bit
        sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows.32.bit
Modified Files:
        clients/ChangeLog
        clients/Tests/All
        clients/Tests/exports.stable.out
        clients/examples/python/sqlsample.py
        clients/odbc/driver/ODBCUtil.c
        clients/python2/monetdb/control.py
        clients/python2/monetdb/mapi.py
        clients/python2/monetdb/sql/connections.py
        clients/python2/test/runtests.py
        clients/python3/monetdb/control.py
        clients/python3/monetdb/mapi.py
        clients/python3/monetdb/sql/connections.py
        clients/python3/test/runtests.py
        gdk/gdk.h
        gdk/gdk_batop.c
        gdk/gdk_imprints.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_private.h
        gdk/gdk_storage.c
        gdk/gdk_utils.c
        monetdb5/extras/jaql/jaqlscenario.c
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
        monetdb5/mal/Makefile.ag
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_client.h
        monetdb5/mal/mal_session.c
        monetdb5/modules/atoms/blob.c
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/kernel/algebra.h
        monetdb5/modules/kernel/algebra.mal
        monetdb5/modules/mal/pqueue.c
        monetdb5/optimizer/opt_pushselect.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.mx
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_scenario.c
        sql/benchmarks/ssbm/Tests/All
        sql/benchmarks/tpch/Tests/21.stable.out
        sql/benchmarks/tpch/Tests/22.stable.out
        sql/benchmarks/tpch/Tests/All
        sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Darwin.32bit
        sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows
        sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py
        sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit
        sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
        sql/server/rel_optimizer.c
        sql/server/rel_updates.c
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_storage.h
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        sql/test/BugTracker-2013/Tests/All
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
        sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
        sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
        sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.stable.err
        sql/test/BugTracker/Tests/python_escape.SF-1916844.SQL.py
        sql/test/concurrent/Tests/crash_on_concurrent_use.SF-1411926.SQL.py
        sql/test/concurrent/Tests/simple_select.SQL.py
        sql/test/leaks/Tests/temp2.stable.out
        sql/test/mapi/Tests/python2_dbapi.SQL.bat
        sql/test/mapi/Tests/python2_dbapi.SQL.sh
        sql/test/mapi/Tests/python3_dbapi.SQL.bat
        sql/test/mapi/Tests/python3_dbapi.SQL.sh
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        testing/Mtest.py.in
Branch: mutation
Log Message:

Merge with default


diffs (truncated from 128537 to 300 lines):

diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,3 +1,6 @@
 # ChangeLog file for clients
 # This file is updated with Maddlog
 
+* Fri Sep  6 2013 Sjoerd Mullender <sjo...@acm.org>
+- ODBC: Implemented {fn scalar()} and {interval ...} escapes.
+
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,1 +1,3 @@
 exports
+MAL-signatures
+SQL-dump
diff --git a/clients/Tests/MAL-signatures.malC 
b/clients/Tests/MAL-signatures.malC
new file mode 100644
--- /dev/null
+++ b/clients/Tests/MAL-signatures.malC
@@ -0,0 +1,1 @@
+?*)
diff --git a/clients/Tests/MAL-signatures.stable.err 
b/clients/Tests/MAL-signatures.stable.err
new file mode 100644
--- /dev/null
+++ b/clients/Tests/MAL-signatures.stable.err
@@ -0,0 +1,29 @@
+stderr of test 'MAL-signatures` in directory 'clients` itself:
+
+
+# 20:07:36 >  
+# 20:07:36 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31131" "--set" 
"mapi_usock=/var/tmp/mtest-1103/.s.monetdb.31131" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients"
 "MAL-signatures.mal"
+# 20:07:36 >  
+
+# builtin opt  gdk_dbpath = 
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/monetdb5/dbfarm/demo
+# builtin opt  gdk_debug = 0
+# builtin opt  gdk_vmtrim = yes
+# builtin opt  monet_prompt = >
+# builtin opt  monet_daemon = no
+# builtin opt  mapi_port = 50000
+# builtin opt  mapi_open = false
+# builtin opt  mapi_autosense = false
+# builtin opt  sql_optimizer = default_pipe
+# builtin opt  sql_debug = 0
+# cmdline opt  gdk_nr_threads = 0
+# cmdline opt  mapi_open = true
+# cmdline opt  mapi_port = 31131
+# cmdline opt  mapi_usock = /var/tmp/mtest-1103/.s.monetdb.31131
+# cmdline opt  monet_prompt = 
+# cmdline opt  mal_listing = 2
+# cmdline opt  gdk_dbpath = 
/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients
+
+# 20:07:38 >  
+# 20:07:38 >  "Done."
+# 20:07:38 >  
+
diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
new file mode 100644
--- /dev/null
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -0,0 +1,43320 @@
+stdout of test 'MAL-signatures` in directory 'clients` itself:
+
+
+# 20:07:36 >  
+# 20:07:36 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=31131" "--set" 
"mapi_usock=/var/tmp/mtest-1103/.s.monetdb.31131" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/manegold/_/Monet/HG/Feb2013/prefix/--disable-debug_--enable-assert_--enable-optimize/var/MonetDB/mTests_clients"
 "MAL-signatures.mal"
+# 20:07:36 >  
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_clients', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically 
linked
+# Found 15.591 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://rome.ins.cwi.nl:31131/
+# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-1103/.s.monetdb.31131
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 00:44:35 >  
+# 00:44:35 >  "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-13629" "--port=31724"
+# 00:44:35 >  
+
+#?*)
+command aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on dbl, also returns count
+
+command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on dbl, also returns count
+
+command 
aggr.avg(b:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on dbl
+
+command aggr.avg(b:bat[:oid,:dbl],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on dbl
+
+command aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on flt, also returns count
+
+command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on flt, also returns count
+
+command 
aggr.avg(b:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on flt
+
+command aggr.avg(b:bat[:oid,:flt],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on flt
+
+command aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on lng, also returns count
+
+command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on lng, also returns count
+
+command 
aggr.avg(b:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on lng
+
+command aggr.avg(b:bat[:oid,:lng],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on lng
+
+command aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on wrd, also returns count
+
+command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on wrd, also returns count
+
+command 
aggr.avg(b:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on wrd
+
+command aggr.avg(b:bat[:oid,:wrd],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on wrd
+
+command aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on int, also returns count
+
+command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on int, also returns count
+
+command 
aggr.avg(b:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on int
+
+command aggr.avg(b:bat[:oid,:int],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on int
+
+command aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on sht, also returns count
+
+command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on sht, also returns count
+
+command 
aggr.avg(b:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on sht
+
+command aggr.avg(b:bat[:oid,:sht],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on sht
+
+command aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]) 
(X_4:bat[:oid,:dbl],X_5:bat[:oid,:wrd]) 
+address AGGRavg23_dbl;
+comment Grouped tail average on bte, also returns count
+
+command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]) 
(X_3:bat[:oid,:dbl],X_4:bat[:oid,:wrd]) 
+address AGGRavg22_dbl;
+comment Grouped tail average on bte, also returns count
+
+command 
aggr.avg(b:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg13_dbl;
+comment Grouped tail average on bte
+
+command aggr.avg(b:bat[:oid,:bte],e:bat[:oid,:any_1]):bat[:oid,:dbl] 
+address AGGRavg12_dbl;
+comment Grouped tail average on bte
+
+command aggr.avg(b:bat[:any_1,:dbl]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:flt]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:lng]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:wrd]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:int]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:sht]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+command aggr.avg(b:bat[:any_1,:bte]):dbl 
+address ALGavg;
+comment Gives the avg of all tail values
+
+function 
aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
+function 
aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:dbl];
+function aggr.corr(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;
+function aggr.covar(e1:bat[:oid,:dbl],e2:bat[:oid,:dbl]):dbl;
+function 
aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];
+function 
aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:flt];
+function aggr.corr(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;
+function aggr.covar(e1:bat[:oid,:flt],e2:bat[:oid,:flt]):flt;
+function 
aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];
+function 
aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:lng];
+function aggr.corr(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;
+function aggr.covar(e1:bat[:oid,:lng],e2:bat[:oid,:lng]):lng;
+function 
aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd];
+function 
aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd];
+function aggr.corr(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd;
+function aggr.covar(e1:bat[:oid,:wrd],e2:bat[:oid,:wrd]):wrd;
+function 
aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];
+function 
aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:int];
+function aggr.corr(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;
+function aggr.covar(e1:bat[:oid,:int],e2:bat[:oid,:int]):int;
+function 
aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];
+function 
aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:sht];
+function aggr.corr(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;
+function aggr.covar(e1:bat[:oid,:sht],e2:bat[:oid,:sht]):sht;
+function 
aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];
+function 
aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:bte];
+function aggr.corr(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;
+function aggr.covar(e1:bat[:oid,:bte],e2:bat[:oid,:bte]):bte;
+command 
aggr.count_no_nil(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]
 
+address AGGRcount3nonils;
+command 
aggr.count(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:wrd]
 
+address AGGRcount3nils;
+comment Grouped count
+
+command 
aggr.count_no_nil(b:bat[:oid,:any_1],e:bat[:oid,:any_1]):bat[:oid,:wrd] 
+address AGGRcount2nonils;
+command aggr.count(b:bat[:void,:any_1],e:bat[:void,:any_2]):bat[:void,:wrd] 
+address AGGRcount2nils;
+command aggr.count(b:bat[:void,:any_1],e:bat[:oid,:any_2]):bat[:void,:wrd] 
+address AGGRcount2nils;
+comment Grouped count
+
+command 
aggr.count(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2],ignorenils:bit):bat[:void,:wrd]
 
+address AGGRcount3;
+command 
aggr.count(b:bat[:oid,:any_1],e:bat[:oid,:any_2],ignorenils:bit):bat[:oid,:wrd] 
+address AGGRcount2;
+comment Grouped count
+
+command aggr.cardinality(b:bat[:any_1,:any_2]):lng 
+address ALGcard;
+comment Return the cardinality of the BAT tail values.
+
+command aggr.count_no_nil(b:bat[:any_1,:any_2]):wrd 
+address ALGcount_no_nil;
+comment Return the number of elements currently        in a BAT ignoring BUNs 
with nil-tail
+
+command aggr.count(b:bat[:any_1,:any],ignore_nils:bit):wrd 
+address ALGcount_nil;
+comment Return the number of elements currently in a BAT ignores               
BUNs with nil-tail iff ignore_nils==TRUE.
+
+command aggr.count(b:bat[:any_1,:any]):wrd 
+address ALGcount_bat;
+comment Return the current size (in number of elements) in a BAT.
+
+command aggr.exist(b:bat[:any_1,:any_2],h:any_1):bit 
+address ALGexist;
+command aggr.histogram(b:bat[:any_1,:any_2]):bat[:any_2,:int] 
+address ALGhistogram;
+comment Produce a BAT containing the histogram over the tail values.
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list

Reply via email to