MonetDB: queryid2 - merge with default
Changeset: c224e8a2b82a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c224e8a2b82a Added Files: monetdb5/extras/rapi/Tests/rapi02.stable.out.int128 sql/backends/monet5/Tests/int_notation_1e5.stable.out.int128 sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out.int128 sql/jdbc/tests/Tests/Test_Int128.stable.out.int128 sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out.int128 sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out.int128 sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out.int128 sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.sql sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.err sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out sql/test/BugTracker-2017/Tests/dce_bug-6177.sql sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.err sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out sql/test/BugTracker-2017/Tests/sqlsmith01.sql sql/test/BugTracker-2017/Tests/sqlsmith01.stable.out sql/test/BugTracker-2017/Tests/sqlsmith02.sql sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out sql/test/BugTracker-2017/Tests/sqlsmith03.sql sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out sql/test/BugTracker-2017/Tests/sqlsmith04.sql sql/test/BugTracker-2017/Tests/sqlsmith04.stable.out sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.sql sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.err sql/test/BugTracker-2017/Tests/str2decimal.Bug-6206.stable.out sql/test/emptydb/Tests/check.SQL.py sql/test/mapi/Tests/mal_int128.stable.out.int128 sql/test/mapi/Tests/perl_dec38.stable.out.int128 sql/test/mapi/Tests/perl_int128.stable.out.int128 sql/test/mapi/Tests/php_dec38.stable.out.int128 sql/test/mapi/Tests/php_int128.stable.out.int128 sql/test/mapi/Tests/python2_dec38.stable.out.int128 sql/test/mapi/Tests/python2_int128.stable.out.int128 sql/test/mapi/Tests/python3_dec38.stable.out.int128 sql/test/mapi/Tests/python3_int128.stable.out.int128 sql/test/mapi/Tests/sql_dec38.stable.out.int128 sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/mergetables/Tests/addtable.sql sql/test/mergetables/Tests/addtable.stable.err sql/test/mergetables/Tests/addtable.stable.out sql/test/pg_regress/Tests/numeric.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/testdb-package-hge.stable.out.int128 Removed Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 gdk/bat.feps gdk/bat.png gdk/bat1.feps gdk/bat1.png gdk/bat2.feps gdk/bat2.png monetdb5/extras/rapi/Tests/rapi02.stable.out sql/backends/monet5/Tests/int_notation_1e5.stable.out sql/backends/monet5/UDF/pyapi/Tests/pyapi_types_huge.stable.out sql/jdbc/tests/Tests/Test_Int128.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single sql/test/BugTracker-2015/Tests/hugeint-wrong-value.Bug-3849.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2017/Tests/cast-with-many-decimals.Bug-6195.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/emptydb/Tests/check.SQL.py.src sql/test/mapi/Tests/mal_int128.stable.out sql/test/mapi/Tests/perl_dec38.stable.out sql/test/mapi/Tests/perl_int128.stable.out sql/test/mapi/Tests/php_dec38.stable.out sql/test/mapi/Tests/ph
MonetDB: Dec2016 - Protect against wrong use of mkey
Changeset: f09a16cd62c8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f09a16cd62c8
Modified Files:
monetdb5/modules/mal/mkey.c
Branch: Dec2016
Log Message:
Protect against wrong use of mkey
The general case of mkey.hash could lead to
incorrect pointer dereferencing.
A defense line has been added.
diffs (15 lines):
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -50,6 +50,11 @@ MKEYhash(Client cntxt, MalBlkPtr mb, Mal
res= getArgReference_lng(stk,p,0);
val= getArgReference(stk,p,1);
switch (ATOMstorage(tpe)) {
+ case TYPE_void:
+ case TYPE_bat:
+ case TYPE_ptr:
+ // illegal types, avoid falling into the default case.
+ assert(0);
case TYPE_bte:
*res = MKEYHASH_bte(val);
break;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Dec2016 - approved output
Changeset: fb230c0cba86 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb230c0cba86 Modified Files: sql/test/copy/Tests/columns.stable.err sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err sql/test/copy/Tests/null_as_string_errors.stable.err Branch: Dec2016 Log Message: approved output diffs (75 lines): diff --git a/sql/test/copy/Tests/columns.stable.err b/sql/test/copy/Tests/columns.stable.err --- a/sql/test/copy/Tests/columns.stable.err +++ b/sql/test/copy/Tests/columns.stable.err @@ -31,8 +31,8 @@ stderr of test 'columns` in directory 's MAPI = (monetdb) /var/tmp/mtest-15100/.s.monetdb.36199 QUERY = copy 3 records into tbl (i, d) from stdin delimiters ',','\n'; 1,2.0 -ERROR = !Failed to import table Column value 2 missing -MAPI = (monetdb) /var/tmp/mtest-15100/.s.monetdb.36199 +ERROR = !Failed to import table 'tbl', Column value 2 missing +MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004 QUERY = 2,2.1 3,2.2 select * from tbl; diff --git a/sql/test/copy/Tests/int_parse.stable.err b/sql/test/copy/Tests/int_parse.stable.err --- a/sql/test/copy/Tests/int_parse.stable.err +++ b/sql/test/copy/Tests/int_parse.stable.err @@ -34,8 +34,8 @@ MAPI = (monetdb) /var/tmp/mtest-29638/. QUERY = copy 3 records into t_int from stdin USING DELIMITERS ',','\n','\"' NULL AS ''; 0 5.1 -ERROR = !Failed to import table line 2 field i 'int' expected in '5.1' -MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 +ERROR = !Failed to import table 't_int', line 2 field i 'int' expected in '5.1' +MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004 QUERY = 9 select * from t_int; @@ -44,8 +44,8 @@ MAPI = (monetdb) /var/tmp/mtest-29638/. QUERY = copy 5 records into t_int from stdin delimiters ',','\n' NULL as ''; 1 nil -ERROR = !Failed to import table line 2 field i 'int' expected in 'nil' -MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 +ERROR = !Failed to import table 't_int', line 2 field i 'int' expected in 'nil' +MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004 QUERY = null abc diff --git a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err --- a/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err +++ b/sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err @@ -73,7 +73,7 @@ MAPI = (monetdb) /var/tmp/mtest-29638/. QUERY = COPY 2 RECORDS INTO "number" FROM stdin USING DELIMITERS ';', '\n'; 1 bla -ERROR = !Failed to import table line 2 field isanumber 'int' expected in 'bla' +ERROR = !Failed to import table 'number', line 2 field isanumber 'int' expected in 'bla' # 17:35:33 > # 17:35:33 > Done. diff --git a/sql/test/copy/Tests/null_as_string_errors.stable.err b/sql/test/copy/Tests/null_as_string_errors.stable.err --- a/sql/test/copy/Tests/null_as_string_errors.stable.err +++ b/sql/test/copy/Tests/null_as_string_errors.stable.err @@ -83,15 +83,15 @@ stderr of test 'null_as_string_errors` i MAPI = (monetdb) /var/tmp/mtest-29638/.s.monetdb.30099 QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; NULL,NULL,NULL -ERROR = !Failed to import table line 1 field i 'int' expected in 'NULL' -MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 +ERROR = !Failed to import table 'null_as_string', line 1 field i 'int' expected in 'NULL' +MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004 QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; NULL,zero,0 -ERROR = !Failed to import table line 1 field i 'int' expected in 'NULL' -MAPI = (monetdb) /var/tmp/mtest-30373/.s.monetdb.34287 +ERROR = !Failed to import table 'null_as_string', line 1 field i 'int' expected in 'NULL' +MAPI = (monetdb) /var/tmp/mtest-25850/.s.monetdb.38004 QUERY = copy 1 records into null_as_string from stdin delimiters ',','\n' NULL as ''; 2,two,NULL -ERROR = !Failed to import table line 1 field d 'decimal(5,2)' expected in 'NULL' +ERROR = !Failed to import table 'null_as_string', line 1 field d 'decimal(5,2)' expected in 'NULL' # 08:37:31 > # 08:37:31 > "Done." ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: data-vaults - Merge with default
Changeset: 75b97e4b5795 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75b97e4b5795 Added Files: sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.sql sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.err sql/test/BugTracker-2017/Tests/crash_on_NULL_ptr.Bug-6130.stable.out sql/test/BugTracker-2017/Tests/dce_bug-6177.sql sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.err sql/test/BugTracker-2017/Tests/dce_bug-6177.stable.out sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out.int128 sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.sql sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.err sql/test/BugTracker-2017/Tests/integer_addition_overflow.Bug-6205.stable.out sql/test/BugTracker-2017/Tests/sqlsmith01.sql sql/test/BugTracker-2017/Tests/sqlsmith01.stable.out sql/test/BugTracker-2017/Tests/sqlsmith02.sql sql/test/BugTracker-2017/Tests/sqlsmith02.stable.out sql/test/BugTracker-2017/Tests/sqlsmith03.sql sql/test/BugTracker-2017/Tests/sqlsmith03.stable.out sql/test/BugTracker-2017/Tests/sqlsmith04.sql sql/test/BugTracker-2017/Tests/sqlsmith04.stable.out sql/test/emptydb/Tests/check.SQL.py sql/test/mergetables/Tests/addtable.sql sql/test/mergetables/Tests/addtable.stable.err sql/test/mergetables/Tests/addtable.stable.out Removed Files: clients/Tests/SQL-dump.SQL.py clients/Tests/SQL-dump.stable.err clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.err.single sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out.single sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out.single sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit sql/test/emptydb/Tests/check.SQL.py.src Modified Files: clients/Tests/All clients/Tests/exports.stable.out gdk/Makefile.ag gdk/gdk_bbp.c monetdb5/mal/mal.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_listing.c monetdb5/mal/mal_parser.c monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_upgrades.c sql/server/rel_dump.c sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_updates.c sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.sql sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.sql sql/test/BugTracker-2014/Tests/querylog.Bug-3607.sql sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.err sql/test/BugTracker-2017/Tests/group-by-on-constant.Bug-6082.stable.out sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.err sql/test/BugTracker-2017/Tests/rel2bin_project-assert.Bug-6080.stable.out sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/bugs/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/All sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/All sql/test/emptydb-upgrade-chain/Tests/check.SQL.py.src sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-hge/Tests/All sql/test/emptydb-upgrade-hge/Tests/check.SQL.py.src sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.o
MonetDB: Dec2016 - Add %license tag.
Changeset: 03a2e4a1c78a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03a2e4a1c78a
Modified Files:
MonetDB.spec
Branch: Dec2016
Log Message:
Add %license tag.
diffs (43 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -201,6 +201,7 @@ package, and most likely also %{name}-SQ
more client packages.
%files
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libbat.so.*
@@ -242,6 +243,7 @@ This package contains a shared library (
various other components.
%files stream
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libstream.so.*
@@ -289,6 +291,7 @@ SQL database so that it can be loaded ba
MonetDB, you will very likely need this package.
%files client
+%license COPYING
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
@@ -375,6 +378,7 @@ odbcinst -u -d -n MonetDB
fi
%files client-odbc
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libMonetODBC.so
%{_libdir}/libMonetODBCs.so
@@ -854,6 +858,7 @@ MonetDB packages. You probably don't ne
developer. If you do want to test, install %{name}-testing-python.
%files testing
+%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
%{_bindir}/MkillUsers
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Dec2016 branch.
Changeset: c162fb78322f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=3Dchangeset;node=3Dc162fb78322f
Modified Files:
MonetDB.spec
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
monetdb5/modules/mal/mkey.c
sql/backends/monet5/sql.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.stable=
.err
sql/test/BugTracker-2008/Tests/copy-format.SF-2468513.stable.err
sql/test/BugTracker-2008/Tests/varchar.SF-2471371.stable.err
sql/test/BugTracker-2009/Tests/copy_into_error_off_by_one.SF-2833696.stabl=
e.err
sql/test/BugTracker-2010/Tests/copy-into-too-long-string.Bug-2358.stable.e=
rr
sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err
sql/test/BugTracker-2010/Tests/incomplete-utf8-sequence.Bug-2575.stable.err
sql/test/BugTracker-2015/Tests/backslash_predecing_separator.Bug-3775.stab=
le.err
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker/Tests/copy_decimal.SF-1582957.stable.err
sql/test/BugTracker/Tests/copy_overflow_null_bug.SF-1842550.stable.err
sql/test/copy/Tests/columns.stable.err
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.err
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (truncated from 315 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -201,6 +201,7 @@ package, and most likely also %{name}-SQ
more client packages.
=20
%files
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libbat.so.*
=20
@@ -242,6 +243,7 @@ This package contains a shared library (
various other components.
=20
%files stream
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libstream.so.*
=20
@@ -289,6 +291,7 @@ SQL database so that it can be loaded ba
MonetDB, you will very likely need this package.
=20
%files client
+%license COPYING
%defattr(-,root,root)
%{_bindir}/mclient
%{_bindir}/msqldump
@@ -375,6 +378,7 @@ odbcinst -u -d -n MonetDB
fi
=20
%files client-odbc
+%license COPYING
%defattr(-,root,root)
%{_libdir}/libMonetODBC.so
%{_libdir}/libMonetODBCs.so
@@ -853,6 +857,7 @@ MonetDB packages. You probably don't ne
developer. If you do want to test, install %{name}-testing-python.
=20
%files testing
+%license COPYING
%defattr(-,root,root)
%{_bindir}/Mdiff
%{_bindir}/MkillUsers
diff --git a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err b/=
geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
--- a/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
+++ b/geom/BugTracker/Tests/copy_into_crash.SF-1975402.stable.err
@@ -13,7 +13,7 @@ stderr of test 'copy_into_crash.SF-19754
MAPI =3D (monetdb) /var/tmp/mtest-27003/.s.monetdb.30235
QUERY =3D COPY 1 RECORDS INTO nodes from STDIN USING DELIMITERS ',', '\n';
45111956, 'POINT(52.0697 4.3723)'
-ERROR =3D !Failed to import table line 1 field p 'geometry(4)' expected in=
' 'POINT(52.0697 4.3723)''
+ERROR =3D !Failed to import table 'nodes', line 1 field p 'geometry(4)' ex=
pected in ' 'POINT(52.0697 4.3723)''
=20
# 13:33:18 > =20
# 13:33:18 > Done.
diff --git a/monetdb5/modules/mal/mkey.c b/monetdb5/modules/mal/mkey.c
--- a/monetdb5/modules/mal/mkey.c
+++ b/monetdb5/modules/mal/mkey.c
@@ -50,6 +50,11 @@ MKEYhash(Client cntxt, MalBlkPtr mb, Mal
res=3D getArgReference_lng(stk,p,0);
val=3D getArgReference(stk,p,1);
switch (ATOMstorage(tpe)) {
+ case TYPE_void:
+ case TYPE_bat:
+ case TYPE_ptr:
+ // illegal types, avoid falling into the default case.
+ assert(0);
case TYPE_bte:
*res =3D MKEYHASH_bte(val);
break;
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2507,7 +2507,7 @@ mvc_import_table_wrap(Client cntxt, MalB
if (fname && s =3D=3D NULL)
throw(IO, "bstreams.create", "Failed to create block stream");
if (b =3D=3D NULL)
- throw(SQL, "importTable", "Failed to import table %s",
be->mvc->errstr);
+ throw(SQL, "importTable", "Failed to import table '%s', %s",
t->base.nam=
e, be->mvc->errstr);
bat2return(stk, pci, b);
GDKfree(b);
return msg;
diff --git a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-11=
00504.stable.err b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into=
.SF-1100504.stable.err
--- a/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.s=
table.err
+++ b/sql/test/BugDay_2005-11-09_2.9.3/Tests/hang_on_copy_into.SF-1100504.s=
table.err
@@ -88,9 +88,7 @@ QUERY =3D COPY 1 RECORDS INTO "news" FROM=20
allemaal nogal lang duurt, maar in principe is het nog
maar een uurtje of 6 werk om het goed te krijgen.
monetdb-perl: default - Added full license.
Changeset: 123c55ac6ba3 for monetdb-perl URL: http://dev.monetdb.org/hg/monetdb-perl?cmd=changeset;node=123c55ac6ba3 Added Files: COPYING Removed Files: license.txt Modified Files: debian/changelog debian/copyright perl-DBD-monetdb.spec Branch: default Log Message: Added full license. diffs (truncated from 799 to 300 lines): diff --git a/COPYING b/COPYING new file mode 100644 --- /dev/null +++ b/COPYING @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +== + +1. Definitions +-- + +1.1. "Contributor" +means each individual or legal entity that creates, contributes to +the creation of, or owns Covered Software. + +1.2. "Contributor Version" +means the combination of the Contributions of others (if any) used +by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" +means Covered Software of a particular Contributor. + +1.4. "Covered Software" +means Source Code Form to which the initial Contributor has attached +the notice in Exhibit A, the Executable Form of such Source Code +Form, and Modifications of such Source Code Form, in each case +including portions thereof. + +1.5. "Incompatible With Secondary Licenses" +means + +(a) that the initial Contributor has attached the notice described +in Exhibit B to the Covered Software; or + +(b) that the Covered Software was made available under the terms of +version 1.1 or earlier of the License, but not also under the +terms of a Secondary License. + +1.6. "Executable Form" +means any form of the work other than Source Code Form. + +1.7. "Larger Work" +means a work that combines Covered Software with other material, in +a separate file or files, that is not Covered Software. + +1.8. "License" +means this document. + +1.9. "Licensable" +means having the right to grant, to the maximum extent possible, +whether at the time of the initial grant or subsequently, any and +all of the rights conveyed by this License. + +1.10. "Modifications" +means any of the following: + +(a) any file in Source Code Form that results from an addition to, +deletion from, or modification of the contents of Covered +Software; or + +(b) any new file in Source Code Form that contains any Covered +Software. + +1.11. "Patent Claims" of a Contributor +means any patent claim(s), including without limitation, method, +process, and apparatus claims, in any patent Licensable by such +Contributor that would be infringed, but for the grant of the +License, by the making, using, selling, offering for sale, having +made, import, or transfer of either its Contributions or its +Contributor Version. + +1.12. "Secondary License" +means either the GNU General Public License, Version 2.0, the GNU +Lesser General Public License, Version 2.1, the GNU Affero General +Public License, Version 3.0, or any later versions of those +licenses. + +1.13. "Source Code Form" +means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") +means an individual or a legal entity exercising rights under this +License. For legal entities, "You" includes any entity that +controls, is controlled by, or is under common control with You. For +purposes of this definition, "control" means (a) the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (b) ownership of more than +fifty percent (50%) of the outstanding shares or beneficial +ownership of such entity. + +2. License Grants and Conditions + + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) +Licensable by such Contributor to use, reproduce, make available, +modify, display, perform, distribute, and otherwise exploit its +Contributions, either on an unmodified basis, with Modifications, or +as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer +for sale, have made, import, and otherwise transfer either its +Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed
monetdb-php: default - Added full license text.
Changeset: a72624c58ddf for monetdb-php URL: http://dev.monetdb.org/hg/monetdb-php?cmd=changeset;node=a72624c58ddf Added Files: COPYING Removed Files: license.txt Modified Files: debian/changelog debian/copyright php-monetdb.spec Branch: default Log Message: Added full license text. diffs (truncated from 818 to 300 lines): diff --git a/COPYING b/COPYING new file mode 100644 --- /dev/null +++ b/COPYING @@ -0,0 +1,373 @@ +Mozilla Public License Version 2.0 +== + +1. Definitions +-- + +1.1. "Contributor" +means each individual or legal entity that creates, contributes to +the creation of, or owns Covered Software. + +1.2. "Contributor Version" +means the combination of the Contributions of others (if any) used +by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" +means Covered Software of a particular Contributor. + +1.4. "Covered Software" +means Source Code Form to which the initial Contributor has attached +the notice in Exhibit A, the Executable Form of such Source Code +Form, and Modifications of such Source Code Form, in each case +including portions thereof. + +1.5. "Incompatible With Secondary Licenses" +means + +(a) that the initial Contributor has attached the notice described +in Exhibit B to the Covered Software; or + +(b) that the Covered Software was made available under the terms of +version 1.1 or earlier of the License, but not also under the +terms of a Secondary License. + +1.6. "Executable Form" +means any form of the work other than Source Code Form. + +1.7. "Larger Work" +means a work that combines Covered Software with other material, in +a separate file or files, that is not Covered Software. + +1.8. "License" +means this document. + +1.9. "Licensable" +means having the right to grant, to the maximum extent possible, +whether at the time of the initial grant or subsequently, any and +all of the rights conveyed by this License. + +1.10. "Modifications" +means any of the following: + +(a) any file in Source Code Form that results from an addition to, +deletion from, or modification of the contents of Covered +Software; or + +(b) any new file in Source Code Form that contains any Covered +Software. + +1.11. "Patent Claims" of a Contributor +means any patent claim(s), including without limitation, method, +process, and apparatus claims, in any patent Licensable by such +Contributor that would be infringed, but for the grant of the +License, by the making, using, selling, offering for sale, having +made, import, or transfer of either its Contributions or its +Contributor Version. + +1.12. "Secondary License" +means either the GNU General Public License, Version 2.0, the GNU +Lesser General Public License, Version 2.1, the GNU Affero General +Public License, Version 3.0, or any later versions of those +licenses. + +1.13. "Source Code Form" +means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") +means an individual or a legal entity exercising rights under this +License. For legal entities, "You" includes any entity that +controls, is controlled by, or is under common control with You. For +purposes of this definition, "control" means (a) the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (b) ownership of more than +fifty percent (50%) of the outstanding shares or beneficial +ownership of such entity. + +2. License Grants and Conditions + + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) +Licensable by such Contributor to use, reproduce, make available, +modify, display, perform, distribute, and otherwise exploit its +Contributions, either on an unmodified basis, with Modifications, or +as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer +for sale, have made, import, and otherwise transfer either its +Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed fr
