Changeset: d8a3c083b5e1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d8a3c083b5e1 Added Files: sql/test/BugTracker-2016/Tests/NULLtinyintBAT.bin sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.sql sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.stable.err sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.stable.out sql/test/BugTracker-2016/Tests/noNULLtinyintBAT.bin sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937-prepare.bat sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937-prepare.sh sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937-prepare.stable.err sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937-prepare.stable.out sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937-prepare.stable.out.Windows sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.reqtests sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.sql.in sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.stable.err sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.stable.out Modified Files: .hgtags MonetDB.spec NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-Geom-Module.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-Geom-Module.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj NT/monetdb_config.h.in NT/rules.msc clients/Tests/SQL-dump.stable.out.int128 clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc clients/python2/setup.py clients/python3/setup.py configure.ag debian/changelog gdk/gdk_bat.c gdk/libbat.rc libversions monetdb5/ChangeLog-Archive monetdb5/ChangeLog.Jul2015 monetdb5/mal/Tests/tst1203.stable.out monetdb5/mal/Tests/tst1205.stable.out monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_statistics.c sql/common/sql_types.c sql/include/sql_catalog.h sql/server/rel_updates.c sql/server/sql_mvc.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/sql_storage.h sql/storage/store.c sql/test/BugDay_2005-11-09_2.9.3/Tests/date_functions.SF-967145.stable.out sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.sql sql/test/BugTracker-2015/Tests/long_insert.Bug-3845.stable.out sql/test/BugTracker-2016/Tests/All sql/test/VOC/Tests/median.Bug-3096.stable.out sql/test/bugs/Tests/default_with_cast.SF-1334486.stable.out sql/test/mapi/Tests/utf8test.SQL.py sql/test/mapi/Tests/utf8test.stable.out sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/date.stable.out testing/Mfilter.py testing/Mtest.py.in testing/exportutils.py testing/listexports.py.in testing/monet_options.py.in testing/process.py vertoo.data Branch: embedded Log Message:
merge diffs (truncated from 6144 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -615,3 +615,5 @@ d1dd6e5b7a5acfe14a33070e08c776341996deb2 2ca94cddcdf52121541eff4bf706b1b7c451f511 Jul2015_SP1_release 25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_13 25c9f569add9c341d40920f30936890ae6ea68a8 Jul2015_SP2_release +feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_15 +feec2e4020548d3137a0e946b7a4e29db5b9e14a Jul2015_SP3_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -102,9 +102,9 @@ Summary: MonetDB - Monet Database Manage Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases -License: MPL - http://www.monetdb.org/Legal/MonetDBLicense +License: MPLv2.0 URL: http://www.monetdb.org/ -Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP2/%{name}-%{version}.tar.bz2 +Source: http://dev.monetdb.org/downloads/sources/Jul2015-SP3/%{name}-%{version}.tar.bz2 BuildRequires: bison BuildRequires: bzip2-devel @@ -984,6 +984,34 @@ rm -f %{buildroot}%{_bindir}/Maddlog %postun -p /sbin/ldconfig %changelog +* Thu Mar 10 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.15-20160310 +- Rebuilt. +- BZ#3549: bulk string operations very slow +- BZ#3908: LEFT JOIN with OR conditions triggers assertion +- BZ#3909: Incorrect column name in OR condition of LEFT JOIN crashes + mserver +- BZ#3910: COPY INTO table (column1, column2) got wrong result +- BZ#3912: When table/column names conflicts, data ends in multiple + tables! +- BZ#3918: MonetDB.R version 1.0.1 incorrectly constructs the batfile + script +- BZ#3919: Table conflict when the table name and fields are identical +- BZ#3921: Creating a table from a complex query crashes mserver or + triggers assertion +- BZ#3922: AVG( column ) returns NaN rather than Inf when column + contains Inf +- BZ#3928: When killing a virtual machine, sql_logs/sql/log is empty +- BZ#3930: Wrong typecast on character columns in prepared statements + when using Umlaute +- BZ#3932: CASE expressions with constants are not evaluated correctly +- BZ#3933: replace "exit" by "throw new Exception" +- BZ#3937: bad BAT properties with binary copy into and NULL values +- BZ#3940: Date calculation and comparison produce wrong result + +* Tue Jan 5 2016 Martin Kersten <m...@cwi.nl> - 11.21.15-20160310 +- monetdb5: Fixed potential crash in MAL debugger when accessing BATs by + index. Functionality dropped as it is also a security leak. + * Tue Jan 05 2016 Sjoerd Mullender <sjo...@acm.org> - 11.21.13-20160105 - Rebuilt. - BZ#2014: 'null' from copy into gets wrong diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,37 @@ +monetdb (11.21.15) unstable; urgency=low + + * Rebuilt. + * BZ#3549: bulk string operations very slow + * BZ#3908: LEFT JOIN with OR conditions triggers assertion + * BZ#3909: Incorrect column name in OR condition of LEFT JOIN crashes + mserver + * BZ#3910: COPY INTO table (column1, column2) got wrong result + * BZ#3912: When table/column names conflicts, data ends in multiple + tables! + * BZ#3918: MonetDB.R version 1.0.1 incorrectly constructs the batfile + script + * BZ#3919: Table conflict when the table name and fields are identical + * BZ#3921: Creating a table from a complex query crashes mserver or + triggers assertion + * BZ#3922: AVG( column ) returns NaN rather than Inf when column + contains Inf + * BZ#3928: When killing a virtual machine, sql_logs/sql/log is empty + * BZ#3930: Wrong typecast on character columns in prepared statements + when using Umlaute + * BZ#3932: CASE expressions with constants are not evaluated correctly + * BZ#3933: replace "exit" by "throw new Exception" + * BZ#3937: bad BAT properties with binary copy into and NULL values + * BZ#3940: Date calculation and comparison produce wrong result + + -- Sjoerd Mullender <sjo...@acm.org> Thu, 10 Mar 2016 09:31:09 +0100 + +monetdb (11.21.15) unstable; urgency=low + + * monetdb5: Fixed potential crash in MAL debugger when accessing BATs by + index. Functionality dropped as it is also a security leak. + + -- Martin Kersten <m...@cwi.nl> Tue, 5 Jan 2016 09:31:09 +0100 + monetdb (11.21.13) unstable; urgency=low * Rebuilt. diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -318,6 +318,11 @@ BATattach(int tt, const char *heapfile, BATkey(bn, TRUE); BATsetcapacity(bn, cap); BATsetcount(bn, cap); + /* + * Unless/until we invest in a scan to check that there indeed + * are no NIL values, we cannot safely assume there are none. + */ + bn->T->nonil = 0; if (cap > 1) { bn->tsorted = 0; bn->trevsorted = 0; 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=12:6:0 +GDK_VERSION=12:7:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=7:6:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=20:1:1 +MONETDB5_VERSION=20:2:1 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=7:0:0 diff --git a/monetdb5/ChangeLog-Archive b/monetdb5/ChangeLog-Archive --- a/monetdb5/ChangeLog-Archive +++ b/monetdb5/ChangeLog-Archive @@ -1,6 +1,10 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Tue Sep 8 2015 Martin Kersten <m...@cwi.nl> - 11.21.15-20160310 +- Fixed potential crash in MAL debugger when accessing BATs by + index. Functionality dropped as it is also a security leak. + * Thu Jan 29 2015 Sjoerd Mullender <sjo...@acm.org> - 11.21.1-20150807 - Implemented batcalc.min and batcalc.max. Made calc.min and calc.max generic so that no other implementations are needed. diff --git a/monetdb5/ChangeLog.Jul2015 b/monetdb5/ChangeLog.Jul2015 --- a/monetdb5/ChangeLog.Jul2015 +++ b/monetdb5/ChangeLog.Jul2015 @@ -1,7 +1,3 @@ # ChangeLog file for MonetDB5 # This file is updated with Maddlog -* Tue Sep 8 2015 Martin Kersten <m...@cwi.nl> -- Fixed potential crash in MAL debugger when accessing BATs by - index. Functionality dropped as it is also a security leak. - diff --git a/monetdb5/mal/Tests/tst1203.stable.out b/monetdb5/mal/Tests/tst1203.stable.out --- a/monetdb5/mal/Tests/tst1203.stable.out +++ b/monetdb5/mal/Tests/tst1203.stable.out @@ -29,260 +29,36 @@ Ready. # 15:36:11 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-16148" "--port=33827" # 15:36:11 > -# MonetDB Server v5.0.0_beta2_1 -# Copyright (c) 1993-2007 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# dbname:mTests_src_mal -# Visit http://monetdb.cwi.nl/ for further information -## Mil compiler Version 1.0) -## Copyright (c) 1993-2001, CWI. All rights reserved. -# -## Predefined code segment -## -###line 531 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx" -##module(monettime,alarm); -## -## -## -#lzone:= mtime.timezone("GMT+1"); -#mtime.timezone_local(lzone); -###line 535 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx" -### test the various ways to create rules -# rule_jan:= mtime.rule("1st MON from start of JAN@01:15"); -##var rule_jan := mtime.rule("1st MON from start of JAN@01:15"); -# rule_mar:= mtime.rule("first WEDNE on or after march 10@01:15"); -##var rule_mar := mtime.rule("first WEDNE on or after march 10@01:15"); -# rule_apr:= mtime.rule("last THU on or before aPr 1@01:15"); -##var rule_apr := mtime.rule("last THU on or before aPr 1@01:15"); -# rule_may:= mtime.rule("MAY 26@01:15"); -##var rule_may := mtime.rule("MAY 26@01:15"); -# rule_jun:= mtime.rule("2nd TUE from end of june@01:15"); -##var rule_jun := mtime.rule("2nd TUE from end of june@01:15"); -# rule_jul:= mtime.rule(7,1,1,75); -##var rule_jul := mtime.rule(7,1,1,75); -# rule_aug:= mtime.rule(8,-1,1,75); -##var rule_aug := mtime.rule(8,-1,1,75); -# rule_sep:= mtime.rule(9,-10,3,75); -##var rule_sep := mtime.rule(9,-10,3,75); -# rule_oct:= mtime.rule(10,31,0,75); -##var rule_oct := mtime.rule(10,31,0,75); -# rule_nov:= mtime.rule(11,-10,-4,75); -##var rule_nov := mtime.rule(11,-10,-4,75); -### nil rules -# rule_dec:= mtime.rule(12,-31,0,75); -##var rule_dec := mtime.rule(12,-31,0,75); -# rule_feb:= mtime.rule("first fRiDaY on or after february 30@01:15"); -##var rule_feb := mtime.rule("first fRiDaY on or after february 30@01:15"); -## -# rule_bat:= bat.new(:str,:zrule,10); -##var rule_bat := bat.new(str,rule,10); -# bat.insert(rule_bat,"jan",rule_jan); -# bat.insert(rule_bat,"feb",rule_feb); -# bat.insert(rule_bat,"mar",rule_mar); -# bat.insert(rule_bat,"apr",rule_apr); -##rule_bat.bat.insert("jan",rule_jan).insert("feb",rule_feb).insert("mar",rule_mar).insert("apr",rule_apr); -# bat.insert(rule_bat,"may",rule_may); -# bat.insert(rule_bat,"jun",rule_jun); -# bat.insert(rule_bat,"jul",rule_jul); -# bat.insert(rule_bat,"aug",rule_aug); -##rule_bat.bat.insert("may",rule_may).insert("jun",rule_jun).insert("jul",rule_jul).insert("aug",rule_aug); -# bat.insert(rule_bat,"sep",rule_sep); -# bat.insert(rule_bat,"oct",rule_oct); -# bat.insert(rule_bat,"nov",rule_nov); -# bat.insert(rule_bat,"dec",rule_dec); -##rule_bat.bat.insert("sep",rule_sep).insert("oct",rule_oct).insert("nov",rule_nov).insert("dec",rule_dec); -## -## -###line 580 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx" -### test the various ways to create timezones, using some of the above created rules -# tzone_00:= mtime.timezone("GMT"); -##var tzone_00 := mtime.timezone("GMT"); -# tzone_01:= mtime.timezone("GMT+01:00"); -##var tzone_01 := mtime.timezone("GMT+01:00"); -# tzone_02:= mtime.timezone("GMT+0100"); -##var tzone_02 := mtime.timezone("GMT+0100"); -# tzone_03:= mtime.timezone(60,rule_oct,rule_mar); -##var tzone_03 := mtime.timezone(60, rule_oct, rule_mar); -# tzone_04:= mtime.timezone(0,rule_jan,rule_aug); -##var tzone_04 := mtime.timezone(0, rule_jan, rule_aug); -# tzone_05:= mtime.timezone(-97,rule_oct,rule_apr); -##var tzone_05 := mtime.timezone(-97, rule_oct, rule_apr); -# tzone_06:= mtime.timezone(-97,rule_may,rule_sep); -##var tzone_06 := mtime.timezone(-97, rule_may, rule_sep); -# mc_a := calc.*(23,60); -# tzone_07:= mtime.timezone(mc_a,rule_apr,rule_nov); -##var tzone_07 := mtime.timezone(23*60, rule_apr, rule_nov); -# nc_a := calc.*(-23,59); -# oc_a := calc.-(nc_a,59); -# tzone_08:= mtime.timezone(oc_a); -##var tzone_08 := mtime.timezone((-23*59) - 59); -# tzone_09:= mtime.timezone(0); -##var tzone_09 := mtime.timezone(0); -# tzone_10:= mtime.timezone(-60); -##var tzone_10 := mtime.timezone(-60); -# pc_a := calc.*(23,60); -# qc_a := calc.+(pc_a,59); -# tzone_11:= mtime.timezone(qc_a); -##var tzone_11 := mtime.timezone((23*60)+59); -# tzone_12:= mtime.timezone(60); -##var tzone_12 := mtime.timezone(60); -### nil tzones -# tzone_13:= mtime.timezone(60,rule_feb,rule_dec); -##var tzone_13 := mtime.timezone(60, rule_feb, rule_dec); -# rc_a := calc.*(24,60); -# tzone_15:= mtime.timezone(rc_a,rule_apr,rule_nov); -##var tzone_15 := mtime.timezone(24*60, rule_apr, rule_nov); -## -## -# tzone_bat:= bat.new(:oid,:timezone); -##var tzone_bat := bat.new(oid,tzone); -# bat.insert(tzone_bat,0@0,tzone_00); -# bat.insert(tzone_bat,1@0,tzone_01); -# bat.insert(tzone_bat,2@0,tzone_02); -##tzone_bat.bat.insert(0@0, tzone_00).insert(1@0, tzone_01).insert(2@0, tzone_02); -# bat.insert(tzone_bat,3@0,tzone_03); -# bat.insert(tzone_bat,4@0,tzone_04); -# bat.insert(tzone_bat,5@0,tzone_05); -##tzone_bat.bat.insert(3@0, tzone_03).insert(4@0, tzone_04).insert(5@0, tzone_05); -# bat.insert(tzone_bat,6@0,tzone_06); -# bat.insert(tzone_bat,7@0,tzone_07); -# bat.insert(tzone_bat,8@0,tzone_08); -##tzone_bat.bat.insert(6@0, tzone_06).insert(7@0, tzone_07).insert(8@0, tzone_08); -# bat.insert(tzone_bat,9@0,tzone_09); -# bat.insert(tzone_bat,10@0,tzone_10); -# bat.insert(tzone_bat,11@0,tzone_11); -##tzone_bat.bat.insert(9@0, tzone_09).insert(10@0, tzone_10).insert(11@0, tzone_11); -# bat.insert(tzone_bat,12@0,tzone_12); -# bat.insert(tzone_bat,13@0,tzone_13); -# bat.insert(tzone_bat,15@0,tzone_15); -##tzone_bat.bat.insert(12@0, tzone_12).insert(13@0, tzone_13).insert(15@0, tzone_15); -## -## -###line 614 "/ufs/mk/monet_5-0/src/modules/atoms/monettime.mx" -### test the various ways to create dates -# date_00:= mtime.date(2000,01,01); -##var date_00 := date(2000,01,01); -# date_01:= mtime.date("5000-JAN-01"); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
