MonetDB: malparsing - Properly handle comment at end of file.

2017-04-18 Thread Martin Kersten 
Changeset: 20b28b92dcf6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20b28b92dcf6
Modified Files:
monetdb5/mal/mal_session.c
Branch: malparsing
Log Message:

Properly handle comment at end of file.


diffs (79 lines):

diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -658,37 +658,37 @@ MALreader(Client c)
 
for( ; c->fdin->pos < c->fdin->len ; l++){
if (!string && *l == '#' ){
-   *s = 0;
+   c->fdin->pos++;
// eat everything away until end of line
-   for( ; *l && c->fdin->pos < c->fdin->len ; l++){
+   for(l++ ; *l && c->fdin->pos < c->fdin->len ; 
l++){
if ( c->listing)
mnstr_printf(c->fdout,"%c", *l);
c->fdin->pos++;
-   if (*l && ( *l == '\n' ||  *l == '\r' ))
+   if (*l == '\n' ||  *l == '\r' )
break;
}
-   return MAL_SUCCEED;
+   } else {
+   // skip string literals
+   if ( *l == '"' ){
+   if ( string == 0)
+   string = 1;
+   else
+   if ( string && *(l-1) != '\\')
+   string = !string;
+   }
+   // collect the characters to be parsed
+   *s++ = *l;
+   c->linefill++;
+   c->fdin->pos++;
+   if ( c->listing)
+   mnstr_printf(c->fdout,"%c", *l);
+   if( string)
+   continue;
+   if ( *l == ';' ){
+   *s = 0;
+   return MAL_SUCCEED;
+   }
}
-   // skip string literals
-   if ( *l == '"' ){
-   if ( string == 0)
-   string = 1;
-   else
-   if ( string && *(l-1) != '\\')
-   string = !string;
-   }
-   *s++ = *l;
-   c->linefill++;
-   c->fdin->pos++;
-   if ( c->listing)
-   mnstr_printf(c->fdout,"%c", *l);
-   if( string)
-   continue;
-   if ( *l == ';' ){
-   *s = 0;
-   return MAL_SUCCEED;
-   }
-   
}
*s = 0;
} while (c->fdin->eof == 0 || blocked);
@@ -716,11 +716,12 @@ MALparser(Client cntxt)
vtop = cntxt->curprg->def->vtop;
 
if( cntxt->linefill == 0)
-   return msg;
+   return MAL_SUCCEED;
// parse a single MAL instruction, add it to the container 
cntxt->curprg->def
finalize= parseMAL(cntxt);
 
assert(cntxt->line);
+   // reset the input buffer
cntxt->linefill = 0;
cntxt->lineptr = cntxt->line;
*cntxt->line = 0;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: exanest - Merge with Dec2016

2017-04-18 Thread Panagiotis Koutsourakis 
} >= 7
@@ -972,6 +972,37 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Rebuilt.
+- BZ#6259: crash on select query from sqlitelogictests
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- gdk: A potential deadlock was fixed in order index creation.
+- gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- monetdb5: Some memory leaks were plugged.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- sql: Some memory leaks were plugged.
+
+* Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
+- Rebuilt.
+- BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
+  is wrong
+- BZ#6254: Crash (and assertion failure) after querying a view which
+  uses a correlated subquery in the select-list
+- BZ#6256: Assertion Trigger on FULL OUTER JOIN with more than two
+  BETWEEN clauses
+- BZ#6257: wrong count values (1 instead of 0) for correlated aggregation
+  queries
+- BZ#6258: Vulnerability in FITS and NETCDF data vaults
+
+* Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
+- sql: Upgrade code was added for an old change in the sys.settimeout function.
+- sql: A bug was fixed with the automatic "vacuum" operation on system tables.
+
 * Thu Mar 30 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.15-20170330
 - Rebuilt.
 - BZ#6250: Assertion failure when querying a Blob column with order
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB ODBC Driver"
-"ProductCode" = "8:{38BCBE4E-1A32-476C-8B89-DCE89C5432A9}"
-"PackageCode" = "8:{7D26CC80-1518-430C-8B89-A1A0238582ED}"
+"ProductCode" = "8:{3D6A93DD-85FF-4D85-BEAF-C76DD48CCFD3}"
+"PackageCode" = "8:{1CCFB11C-CC3E-497C-8A93-D4F51021FE34}"
 "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.16"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -431,15 +431,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5 SQL GIS Module"
-"ProductCode" = "8:{2C63DB2F-AC4B-4F06-8E5D-25993DDB8110}"
-"PackageCode" = "8:{9229148E-27F3-4AD2-9910-3919BF7557EB}"
+"ProductCode" = "8:{031B01C0-7B22-4689-91CA-B359AA5ADD5E}"
+"PackageCode" = "8:{58F57A9F-32DC-4CAD-9E33-BEF4200D13EE}"
 "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.16"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
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
@@ -4340,15 +4340,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5"
-"ProductCode" = &qu

MonetDB: malparsing - Deal with # in strings

2017-04-18 Thread Martin Kersten 
Changeset: 9ec7e0343f79 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ec7e0343f79
Modified Files:
monetdb5/mal/mal_session.c
Branch: malparsing
Log Message:

Deal with # in strings


diffs (43 lines):

diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -657,6 +657,18 @@ MALreader(Client c)
}
 
for( ; c->fdin->pos < c->fdin->len ; l++){
+   if (!string && *l == '#' ){
+   *s = 0;
+   // eat everything away until end of line
+   for( ; *l && c->fdin->pos < c->fdin->len ; l++){
+   if ( c->listing)
+   mnstr_printf(c->fdout,"%c", *l);
+   c->fdin->pos++;
+   if (*l && ( *l == '\n' ||  *l == '\r' ))
+   break;
+   }
+   return MAL_SUCCEED;
+   }
// skip string literals
if ( *l == '"' ){
if ( string == 0)
@@ -677,20 +689,6 @@ MALreader(Client c)
return MAL_SUCCEED;
}

-   if ( *l == '#' ){
-   c->linefill--;
-   s--;
-   *s = 0;
-   // eat everything away until end of line
-   for( l++ ; *l && c->fdin->pos < c->fdin->len ; 
l++){
-   if ( c->listing)
-   mnstr_printf(c->fdout,"%c", *l);
-   c->fdin->pos++;
-   if (*l && ( *l == '\n' ||  *l == '\r' ))
-   break;
-   }
-   return MAL_SUCCEED;
-   }
}
*s = 0;
} while (c->fdin->eof == 0 || blocked);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - sql/test/leaks/check0 was too volatile.

2017-04-18 Thread Sjoerd Mullender 
Changeset: d89a833ad93c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d89a833ad93c
Added Files:
sql/test/leaks/Tests/check1.reqtests
sql/test/leaks/Tests/check1.sql
sql/test/leaks/Tests/check2.reqtests
sql/test/leaks/Tests/check3.reqtests
sql/test/leaks/Tests/check4.reqtests
sql/test/leaks/Tests/check5.reqtests
sql/test/leaks/Tests/drop3.reqtests
sql/test/leaks/Tests/initialize.sql
sql/test/leaks/Tests/initialize.stable.err
sql/test/leaks/Tests/initialize.stable.out
sql/test/leaks/Tests/select1.reqtests
sql/test/leaks/Tests/select2.reqtests
sql/test/leaks/Tests/temp1.reqtests
sql/test/leaks/Tests/temp2.reqtests
sql/test/leaks/Tests/temp3.reqtests
Removed Files:
sql/test/leaks/Tests/check0.sql
sql/test/leaks/Tests/check0.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0.stable.out.int128
sql/test/leaks/Tests/check1.sql.src
Modified Files:
sql/test/leaks/Tests/All
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check2.sql.src
sql/test/leaks/Tests/check3.sql.src
sql/test/leaks/Tests/check4.sql.src
sql/test/leaks/Tests/check5.sql.src
Branch: Dec2016
Log Message:

sql/test/leaks/check0 was too volatile.
Replaced the test by a simple initialization because the old check0
gave different results depending on whether or not the log manager had run.


diffs (truncated from 500 to 300 lines):

diff --git a/sql/test/leaks/Tests/All b/sql/test/leaks/Tests/All
--- a/sql/test/leaks/Tests/All
+++ b/sql/test/leaks/Tests/All
@@ -1,4 +1,4 @@
-HAVE_GEOM_GSL_LIDAR_SHP_NETCDF_SAMTOOLS?check0
+initialize
 HAVE_GEOM_GSL_LIDAR_SHP_NETCDF_SAMTOOLS?check1
 HAVE_GEOM_GSL_LIDAR_SHP_NETCDF_SAMTOOLS?temp1
 HAVE_GEOM_GSL_LIDAR_SHP_NETCDF_SAMTOOLS?check2
diff --git a/sql/test/leaks/Tests/check0.stable.err 
b/sql/test/leaks/Tests/check0.stable.err
deleted file mode 100644
--- a/sql/test/leaks/Tests/check0.stable.err
+++ /dev/null
@@ -1,35 +0,0 @@
-stderr of test 'check0` in directory 'sql/test/leaks` itself:
-
-
-# 16:21:15 >  
-# 16:21:15 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30577" "--set" 
"mapi_usock=/var/tmp/mtest-27819/.s.monetdb.30577" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks" 
"--set" "mal_listing=0"
-# 16:21:15 >  
-
-# builtin opt  gdk_dbpath = 
/ufs/sjoerd/Monet-candidate/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 = 5
-# 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 = 30577
-# cmdline opt  mapi_usock = /var/tmp/mtest-27819/.s.monetdb.30577
-# cmdline opt  monet_prompt = 
-# cmdline opt  mal_listing = 2
-# cmdline opt  gdk_dbpath = 
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks
-# cmdline opt  mal_listing = 0
-
-# 16:21:15 >  
-# 16:21:15 >  "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" 
"--host=/var/tmp/mtest-27819" "--port=30577"
-# 16:21:15 >  
-
-
-# 16:21:16 >  
-# 16:21:16 >  "Done."
-# 16:21:16 >  
-
diff --git a/sql/test/leaks/Tests/check0.stable.out 
b/sql/test/leaks/Tests/check0.stable.out
deleted file mode 100644
--- a/sql/test/leaks/Tests/check0.stable.out
+++ /dev/null
@@ -1,94 +0,0 @@
-stdout of test 'check0` in directory 'sql/test/leaks` itself:
-
-
-# 16:21:15 >  
-# 16:21:15 >  "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" 
"mapi_open=true" "--set" "mapi_port=30577" "--set" 
"mapi_usock=/var/tmp/mtest-27819/.s.monetdb.30577" "--set" "monet_prompt=" 
"--forcemito" "--set" "mal_listing=2" 
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks" 
"--set" "mal_listing=0"
-# 16:21:15 >  
-
-# MonetDB 5 server v11.17.0 (hg id: d91089635868)
-# This is an unreleased version
-# Serving database 'mTests_sql_test_leaks', 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-2015 MonetDB B.V., all rights reserved
-# Visit http://www.monetdb.org/ for further information
-# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:30577/
-# Listening for UNIX domain connection requests on 
mapi:monetdb:///var/tmp/mtest-27819/.s.monetdb.30577
-# MonetDB/GIS module loaded
-# MonetDB/JAQL module loaded
-# MonetDB/SQL module loaded
-
-Ready.
-# SQL catalog created, loading sql scripts once
-# loading sql script: 09_like.sql
-# loading sql script: 10_math.sql
-# loading

MonetDB: Dec2016 - Post release build.

2017-04-18 Thread Sjoerd Mullender 
Changeset: 7e123015bc3e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7e123015bc3e
Modified Files:
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/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Dec2016
Log Message:

Post release build.


diffs (truncated from 308 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.25.19
+%define version 11.25.20
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
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
@@ -4348,7 +4348,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -574,7 +574,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj 
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -439,7 +439,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj 
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -4348,7 +4348,7 @@
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.19"
+"ProductVersion" = "8:11.25.20"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -754,7 +754,7 @@
 #define MONETDB5_PASSWDHASH_TOKEN SHA512
 
 /* Release name or "unreleased" */
-#define MONETDB_RELEASE "Dec2016-SP4"
+#define MONETDB_RELEASE "unreleased"
 
 /* Suffix for C++ files */
 #define MX_CXX_SUFFIX "cxx"
@@ -772,13 +772,13 @@
 #define PACKAGE_NAME "MonetDB"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MonetDB 11.25.19"

MonetDB: default - Merge with Dec2016 branch, not changing any f...

2017-04-18 Thread Sjoerd Mullender 
Changeset: 152e4a697a97 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=152e4a697a97
Modified Files:
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/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Dec2016 branch, not changing any files..

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Dec2016 branch.

2017-04-18 Thread Sjoerd Mullender 
Changeset: a5d26b279988 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a5d26b279988
Modified Files:
.hgtags
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Dec2016
libversions
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2016
sql/ChangeLog-Archive
sql/ChangeLog.Dec2016
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (161 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -664,3 +664,6 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release
 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17
 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_19
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -953,6 +953,21 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Rebuilt.
+- BZ#6259: crash on select query from sqlitelogictests
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- gdk: A potential deadlock was fixed in order index creation.
+- gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- monetdb5: Some memory leaks were plugged.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- sql: Some memory leaks were plugged.
+
 * Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
 - Rebuilt.
 - BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+monetdb (11.25.19) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6259: crash on select query from sqlitelogictests
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * gdk: A potential deadlock was fixed in order index creation.
+  * gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+was fixed.  See changeset 98ad79c555cc for details.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * monetdb5: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * sql: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
 monetdb (11.25.17) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- A potential deadlock was fixed in order index creation.
+- A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
 * Tue Feb 28 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313
 - Fixed a bug when appending string bats that are fully duplicate
   eliminated.  It could happend that the to-be-appended bat had an empty
diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
--- a/gdk/ChangeLog.Dec2016
+++ b/gdk/ChangeLog.Dec2016
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- A potential deadlock was fixed in order index creation.
-- A bug that could happen during recovery of the write-ahead log (WAL)
-  was fixed.  See changeset 98ad79c555cc for details.
-
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=14:5:1
+GDK_VERSION=14:6:1
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=8:1:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:4:1
+MONETDB5_VERSION=22:5:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=9:0:1
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 18 2017 Sjoerd Mullende

MonetDB: Dec2016 - Setting tags Dec2016_19 and Dec2016_SP4 for t...

2017-04-18 Thread Sjoerd Mullender 
Changeset: 836507ec04bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=836507ec04bc
Modified Files:
.hgtags
Branch: Dec2016
Log Message:

Setting tags Dec2016_19 and Dec2016_SP4 for the release build.


diffs (10 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -664,3 +664,6 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release
 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17
 07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_19
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
+c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd Dec2016_SP4_release
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - Moved contents of ChangeLog.Dec2016 to MonetD...

2017-04-18 Thread Sjoerd Mullender 
Changeset: c57454c6c6f6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c57454c6c6f6
Modified Files:
MonetDB.spec
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Dec2016
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2016
sql/ChangeLog-Archive
sql/ChangeLog.Dec2016
Branch: Dec2016
Log Message:

Moved contents of ChangeLog.Dec2016 to MonetDB.spec, debian/changelog and 
ChangeLog-Archive.


diffs (132 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -972,6 +972,21 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Rebuilt.
+- BZ#6259: crash on select query from sqlitelogictests
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- gdk: A potential deadlock was fixed in order index creation.
+- gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- monetdb5: Some memory leaks were plugged.
+
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- sql: Some memory leaks were plugged.
+
 * Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.17-20170411
 - Rebuilt.
 - BZ#6110: cast of a SQL boolean value to a string or clob or (var)char
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+monetdb (11.25.19) unstable; urgency=low
+
+  * Rebuilt.
+  * BZ#6259: crash on select query from sqlitelogictests
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * gdk: A potential deadlock was fixed in order index creation.
+  * gdk: A bug that could happen during recovery of the write-ahead log (WAL)
+was fixed.  See changeset 98ad79c555cc for details.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * monetdb5: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
+monetdb (11.25.19) unstable; urgency=low
+
+  * sql: Some memory leaks were plugged.
+
+ -- Sjoerd Mullender <sjo...@acm.org>  Tue, 18 Apr 2017 10:14:40 +0200
+
 monetdb (11.25.17) unstable; urgency=low
 
   * Rebuilt.
diff --git a/gdk/ChangeLog-Archive b/gdk/ChangeLog-Archive
--- a/gdk/ChangeLog-Archive
+++ b/gdk/ChangeLog-Archive
@@ -1,6 +1,11 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- A potential deadlock was fixed in order index creation.
+- A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
 * Tue Feb 28 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.11-20170313
 - Fixed a bug when appending string bats that are fully duplicate
   eliminated.  It could happend that the to-be-appended bat had an empty
diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
--- a/gdk/ChangeLog.Dec2016
+++ b/gdk/ChangeLog.Dec2016
@@ -1,8 +1,3 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- A potential deadlock was fixed in order index creation.
-- A bug that could happen during recovery of the write-ahead log (WAL)
-  was fixed.  See changeset 98ad79c555cc for details.
-
diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive
--- a/monetdb5/ChangeLog-Archive
+++ b/monetdb5/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Some memory leaks were plugged.
+
 * Wed Aug  3 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
 - Removed the zorder module with functions zorder.encode, zorder.decode_x
   and zorder.decode_y.
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,6 +1,3 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
-* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org>
-- Some memory leaks were plugged.
-
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1,9 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Tue Apr 18 2017 Sjoerd Mullender <sjo...@acm.org> - 11.25.19-20170418
+- Some memory leaks were plugged.
+
 * Tue Apr 11 2017 Sjoerd Mullender <sjo...@acm.org> -

MonetDB: Dec2016 - Updated library versions.

2017-04-18 Thread Sjoerd Mullender 
Changeset: 98006b5bf344 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98006b5bf344
Modified Files:
libversions
Branch: Dec2016
Log Message:

Updated library versions.


diffs (19 lines):

diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-GDK_VERSION=14:5:1
+GDK_VERSION=14:6:1
 
 # version of the MAPI library (subdirectory clients/mapilib)
 MAPI_VERSION=8:1:0
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:4:1
+MONETDB5_VERSION=22:5:1
 
 # version of the STREAM library (subdirectory common/stream)
 STREAM_VERSION=9:0:1
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: default - Merge with Dec2016 branch, not changing any f...

2017-04-18 Thread Sjoerd Mullender 
Changeset: 3f626456e044 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3f626456e044
Modified Files:
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/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: default
Log Message:

Merge with Dec2016 branch, not changing any files.

___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - Pre-release version number update.

2017-04-18 Thread Sjoerd Mullender 
Changeset: 363cbddcfccc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=363cbddcfccc
Modified Files:
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/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Dec2016
Log Message:

Pre-release version number update.


diffs (truncated from 368 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
 %define name MonetDB
-%define version 11.25.18
+%define version 11.25.19
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # groups of related archs
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj 
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB ODBC Driver"
-"ProductCode" = "8:{DBB9D00C-A400-4C2C-9149-CA387AAB7FFD}"
-"PackageCode" = "8:{2F7E5545-9521-404B-A8A6-45C58CF26460}"
+"ProductCode" = "8:{3D6A93DD-85FF-4D85-BEAF-C76DD48CCFD3}"
+"PackageCode" = "8:{1CCFB11C-CC3E-497C-8A93-D4F51021FE34}"
 "UpgradeCode" = "8:{C1F69378-3F5C-4120-8224-32F07D3458F3}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.18"
+"ProductVersion" = "8:11.25.19"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj 
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -431,15 +431,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5 SQL GIS Module"
-"ProductCode" = "8:{FE2BF0CB-78B4-4111-8C51-4FA1910E107A}"
-"PackageCode" = "8:{5757FDA8-EF70-4DEC-9F93-F1F53E800F99}"
+"ProductCode" = "8:{031B01C0-7B22-4689-91CA-B359AA5ADD5E}"
+"PackageCode" = "8:{58F57A9F-32DC-4CAD-9E33-BEF4200D13EE}"
 "UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.18"
+"ProductVersion" = "8:11.25.19"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
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
@@ -4340,15 +4340,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB5"
-"ProductCode" = "8:{32416046-C7F7-4362-AB43-25B166056AF1}"
-"PackageCode" = "8:{BDACC3DB-5B61-4E33-9264-BC365F0641C2}"
+"ProductCode" = "8:{2D762729-3433-4733-AEF1-D55FD6167F99}"
+"PackageCode" = "8:{27F789B2-F3E7-4E91-BCDE-59B086253BEF}"
 "UpgradeCode" = "8:{730C595B-DBA6-48D7-94B8-A98780AC92B6}"
 "AspNetVersion" = "8:4.0.30319.0"
 "RestartWWWService" = "11:FALSE"
 "RemovePreviousVersions" = "11:TRUE"
 "DetectNewerInstalledVersion" = "11:TRUE"
 "InstallAllUsers" = "11:TRUE"
-"ProductVersion" = "8:11.25.18"
+"ProductVersion" = "8:11.25.19"
 "Manufacturer" = "8:MonetDB"
 "ARPHELPTELEPHONE" = "8:"
 "ARPHELPLINK" = "8:http://www.monetdb.org/;
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj 
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -566,15 +566,15 @@
 {
 "Name" = "8:Microsoft Visual Studio"
 "ProductName" = "8:MonetDB ODBC Driver"
-"ProductCode" = "8:{4F6829D7-CC0E-4356-8424-7C59DA1A93D1}"
-"PackageCode" = "8:{AFAC49D5-811D-48D5-B7C8-3E78FEA5CF02}"
+"ProductCode" = "8:{6FF86A27-C17F-4617-B117-CC799EAF221E}"
+"PackageCode" = "8:{CA63502B-CBBF-4299-B7F3-39AA42844120}"

MonetDB: wlcr - Merge with default

2017-04-18 Thread Panagiotis Koutsourakis 
Changeset: 04f4331c7f9b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=04f4331c7f9b
Added Files:
sql/test/BugTracker-2017/Tests/select.Bug-6259.sql
sql/test/BugTracker-2017/Tests/select.Bug-6259.stable.err
sql/test/BugTracker-2017/Tests/select.Bug-6259.stable.out
Modified Files:
.hgtags
ChangeLog
MonetDB.spec
clients/Tests/exports.stable.out
clients/mapiclient/Tests/mclient--help.stable.err.Windows
common/stream/Makefile.ag
common/stream/stream.c
common/stream/stream.h
common/utils/mcrypt.c
configure.ag
debian/changelog
gdk/ChangeLog.Dec2016
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_logger.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_utils.c
libversions
monetdb5/ChangeLog.Dec2016
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
monetdb5/mal/mal_stack.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/scheduler/run_pipeline.h
sql/ChangeLog-Archive
sql/ChangeLog.Dec2016
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_upgrades.c
sql/server/rel_optimizer.c
sql/server/rel_updates.c
sql/storage/store.c

sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out

sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
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/pg_regress/Tests/reltime.sql
sql/test/pg_regress/Tests/reltime.stable.err
sql/test/pg_regress/Tests/reltime.stable.out
sql/test/sql_xml/Tests/xml.reqtests
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql

sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
tools/mserver/mserver5.1.in
Branch: wlcr
Log Message:

Merge with default


diffs (truncated from 4642 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -662,3 +662,5 @@ 94a35822a8d9dfc6458a2353168e37a21b16ea29
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_15
 94a35822a8d9dfc6458a2353168e37a21b16ea29 Dec2016_SP3_release
 8dcbdc30cd49d1d03e3a21b37671d567d84943ae Dec2016_SP3_release
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_17
+07824a1c7beb75308b813378af33c243f1c2f511 Dec2016_SP4_release
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
+* Thu April 13 2017 Mark Raasveldt 
+- Added a new server-side protocol implementation. The new protocol is 
backwards compatible with the old protocol. Clients can choose whether they 
want to use the old or the new protocol during the initial handshake with the 
server. The new protocol is a binary column-based protocol that is 
significantly faster than the old protocol when transferring large result sets. 
In addition, the new protocol supports compression using Snappy or LZ4.
+
 * Thu Jan 12 2017 Martin van Dinther 
 - Added 5 new sys schema tables: function_languages, function_types,
   key_types, index_types and privilege_codes.  They are pre-loaded with
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV 
 Group: Applications/Databases
 License: MPLv2.0
 URL: http://www.monetdb.org/
-Source: 
http://dev.monetdb.org/downloads/sources/Dec2016-SP3/%{name}-%{version}.tar.bz2
+Source:

MonetDB: data-vaults - Merge with default

2017-04-18 Thread Panagiotis Koutsourakis 
Changeset: 4654c2290d0e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4654c2290d0e
Added Files:
sql/test/BugTracker-2017/Tests/select.Bug-6259.sql
sql/test/BugTracker-2017/Tests/select.Bug-6259.stable.err
sql/test/BugTracker-2017/Tests/select.Bug-6259.stable.out
Modified Files:
ChangeLog
clients/Tests/exports.stable.out
clients/mapiclient/Tests/mclient--help.stable.err.Windows
common/stream/Makefile.ag
common/stream/stream.c
common/stream/stream.h
common/utils/mcrypt.c
configure.ag
gdk/ChangeLog.Dec2016
gdk/gdk.h
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_utils.c
monetdb5/ChangeLog.Dec2016
monetdb5/extras/rapi/rapi.c
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
monetdb5/mal/mal_session.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/scheduler/run_pipeline.h
sql/ChangeLog.Dec2016
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_result.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h

sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin
sql/test/BugTracker-2017/Tests/All
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out

sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
sql/test/pg_regress/Tests/reltime.sql
sql/test/pg_regress/Tests/reltime.stable.err
sql/test/pg_regress/Tests/reltime.stable.out
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql

sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
tools/mserver/mserver5.1.in
Branch: data-vaults
Log Message:

Merge with default


diffs (truncated from 3784 to 300 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
+* Thu April 13 2017 Mark Raasveldt 
+- Added a new server-side protocol implementation. The new protocol is 
backwards compatible with the old protocol. Clients can choose whether they 
want to use the old or the new protocol during the initial handshake with the 
server. The new protocol is a binary column-based protocol that is 
significantly faster than the old protocol when transferring large result sets. 
In addition, the new protocol supports compression using Snappy or LZ4.
+
 * Thu Jan 12 2017 Martin van Dinther 
 - Added 5 new sys schema tables: function_languages, function_types,
   key_types, index_types and privilege_codes.  They are pre-loaded with
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
@@ -298,7 +298,6 @@ size_t MT_getrss(void);
 void MT_init(void);
 int MT_join_thread(MT_Id t);
 int MT_lockf(char *filename, int mode, off_t off, off_t len);
-struct Mallinfo MT_mallinfo(void);
 void *MT_mmap(const char *path, int mode, size_t len);
 int MT_munmap(void *p, size_t len);
 int MT_path_absolute(const char *path);
@@ -1393,7 +1392,7 @@ char *MSP_locate_sqlscript(const char *m
 void MSinitClientPrg(Client cntxt, str mod, str nme);
 void MSresetInstructions(MalBlkPtr mb, int start);
 void MSresetVariables(Client cntxt, MalBlkPtr mb, MalStkPtr glb, int start);
-void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout);
+void MSscheduleClient(str command, str challenge, bstream *fin, stream *fout, 
protocol_version protocol, size_t blocksize, int compute_column_widths);
 void MSserveClient(void *dummy);
 str MTIMEcompute_rule_foryear(date *ret, const rule *val, const int *year);
 str MTIMEcurrent_date(date *d);
@@ -1444,6 +1443,8 @@ str MTIMEdaytime_extract_sql_seconds_bul
 str MTIMEdaytime_fromstr(daytime *ret, const char *const *s);
 str MTIMEepilogue(void *ret);
 str MTIMEepoch2int(int *res, const timestamp *ts);
+str MTIMEepoch2lng(lng *res, const timestamp *ts);
+str MTIMEepoch_bulk(bat *ret, bat *bid);
 str MTIMElocal_timezone(lng *res);
 str MTIMEmonth_from_str(int *ret, const char *const *month);
 str MTIMEmonth_to_str(str *ret, const int *month);
@@ -2568,6 +2569,15 @@ str zero_or_oneRef;
 stream *append_wastream(const char *filename);
 stream *append_wstream(const char *filename);
 stream

MonetDB: default - Merge with Dec2016 branch.

2017-04-18 Thread Sjoerd Mullender 
Changeset: c9d50fcfe108 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9d50fcfe108
Modified Files:
gdk/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
Branch: default
Log Message:

Merge with Dec2016 branch.


diffs (32 lines):

diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
--- a/gdk/ChangeLog.Dec2016
+++ b/gdk/ChangeLog.Dec2016
@@ -1,3 +1,8 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- A potential deadlock was fixed in order index creation.
+- A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,3 +1,6 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- Some memory leaks were plugged.
+
diff --git a/sql/ChangeLog.Dec2016 b/sql/ChangeLog.Dec2016
--- a/sql/ChangeLog.Dec2016
+++ b/sql/ChangeLog.Dec2016
@@ -1,3 +1,6 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- Some memory leaks were plugged.
+
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

MonetDB: Dec2016 - Added changelog messages.

2017-04-18 Thread Sjoerd Mullender 
Changeset: 5a8f6a0da5d1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5a8f6a0da5d1
Modified Files:
gdk/ChangeLog.Dec2016
monetdb5/ChangeLog.Dec2016
sql/ChangeLog.Dec2016
Branch: Dec2016
Log Message:

Added changelog messages.


diffs (32 lines):

diff --git a/gdk/ChangeLog.Dec2016 b/gdk/ChangeLog.Dec2016
--- a/gdk/ChangeLog.Dec2016
+++ b/gdk/ChangeLog.Dec2016
@@ -1,3 +1,8 @@
 # ChangeLog file for MonetDB
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- A potential deadlock was fixed in order index creation.
+- A bug that could happen during recovery of the write-ahead log (WAL)
+  was fixed.  See changeset 98ad79c555cc for details.
+
diff --git a/monetdb5/ChangeLog.Dec2016 b/monetdb5/ChangeLog.Dec2016
--- a/monetdb5/ChangeLog.Dec2016
+++ b/monetdb5/ChangeLog.Dec2016
@@ -1,3 +1,6 @@
 # ChangeLog file for MonetDB5
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- Some memory leaks were plugged.
+
diff --git a/sql/ChangeLog.Dec2016 b/sql/ChangeLog.Dec2016
--- a/sql/ChangeLog.Dec2016
+++ b/sql/ChangeLog.Dec2016
@@ -1,3 +1,6 @@
 # ChangeLog file for sql
 # This file is updated with Maddlog
 
+* Tue Apr 18 2017 Sjoerd Mullender 
+- Some memory leaks were plugged.
+
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list