Changeset: 1c8eca509efb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c8eca509efb Modified Files: Makefile.ag MonetDB.spec NT/rules.msc buildtools/Mx/Code.c buildtools/Mx/Def.c buildtools/Mx/Form.c buildtools/Mx/Io.c buildtools/Mx/Mx.c buildtools/Mx/Mx.h buildtools/Mx/MxFcnDef.h buildtools/Mx/Print.c buildtools/Mx/Sys.c buildtools/autogen/autogen/codegen.py buildtools/autogen/autogen/msc.py buildtools/conf/rules.mk buildtools/doc/windowsbuild.rst clients/mapiclient/Makefile.ag clients/mapiclient/mclient.c clients/mapiclient/mnc.c clients/mapilib/mapi.c clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/perl/DBD/monetdb.pm clients/perl/Makefile.ag clients/perl/Mapi.pm clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm clients/perl/MonetDB-CLI/MonetDB/CLI.pm clients/perl/Tests/malsample.pl.in clients/perl/Tests/sqlsample.pl.in clients/python/setup.py common/options/Makefile.ag common/options/monet_options.c common/options/monet_options.h common/stream/stream.c common/stream/stream.h common/utils/mutils.c common/utils/mutils.h configure.ag gdk/Makefile.ag gdk/gdk.mx gdk/gdk_align.c gdk/gdk_atoms.mx gdk/gdk_bat.mx gdk/gdk_batop.mx gdk/gdk_bbp.mx gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_qsort.mx gdk/gdk_rangejoin.mx gdk/gdk_relop.mx gdk/gdk_scanselect.mx gdk/gdk_scanselect_defs_bte.mx gdk/gdk_scanselect_defs_chr.mx gdk/gdk_scanselect_defs_dbl.mx gdk/gdk_scanselect_defs_fix.mx gdk/gdk_scanselect_defs_flt.mx gdk/gdk_scanselect_defs_int.mx gdk/gdk_scanselect_defs_lng.mx gdk/gdk_scanselect_defs_sht.mx gdk/gdk_scanselect_defs_str.mx gdk/gdk_scanselect_defs_var.mx gdk/gdk_search.mx gdk/gdk_setop.mx gdk/gdk_ssort.mx gdk/gdk_storage.c gdk/gdk_storage.h gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_tm.h gdk/gdk_utils.mx gdk/gdk_value.mx geom/lib/Makefile.ag geom/lib/libgeom.c geom/lib/libgeom.h java/Makefile.ag java/src/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java monetdb5/extras/Makefile.ag monetdb5/extras/compiler/mal_compiler.mx monetdb5/extras/crackers/Makefile.ag monetdb5/extras/crackers/crackers_joins.mx monetdb5/extras/crackers/crackers_sortmerge.mx monetdb5/extras/crackers/opt_crack.mx monetdb5/extras/crackers/opt_selcrack.mx monetdb5/extras/crackers/opt_sidcrack.mx monetdb5/extras/sphinx/sphinx.mx monetdb5/mal/mal.mx monetdb5/mal/mal_atom.mx monetdb5/mal/mal_authorize.mx monetdb5/mal/mal_box.mx monetdb5/mal/mal_builder.mx monetdb5/mal/mal_client.mx monetdb5/mal/mal_debugger.mx monetdb5/mal/mal_exception.mx monetdb5/mal/mal_factory.mx monetdb5/mal/mal_function.mx monetdb5/mal/mal_import.mx monetdb5/mal/mal_instruction.mx monetdb5/mal/mal_interpreter.mx monetdb5/mal/mal_module.mx monetdb5/mal/mal_parser.mx monetdb5/mal/mal_profiler.mx monetdb5/mal/mal_recycle.mx monetdb5/mal/mal_resolve.mx monetdb5/mal/mal_scenario.mx monetdb5/misc/msabaoth.c monetdb5/modules/atoms/blob.mx monetdb5/modules/atoms/color.mx monetdb5/modules/atoms/mtime.mx monetdb5/modules/atoms/str.mx monetdb5/modules/atoms/url.mx monetdb5/modules/kernel/aggr_be_avg.mx monetdb5/modules/kernel/aggr_be_count.mx monetdb5/modules/kernel/aggr_be_minmax.mx monetdb5/modules/kernel/aggr_be_prod.mx monetdb5/modules/kernel/aggr_be_sum.mx monetdb5/modules/kernel/aggr_bge_avg.mx monetdb5/modules/kernel/aggr_bge_count.mx monetdb5/modules/kernel/aggr_bge_minmax.mx monetdb5/modules/kernel/aggr_bge_prod.mx monetdb5/modules/kernel/aggr_bge_sum.mx monetdb5/modules/kernel/alarm.mx monetdb5/modules/kernel/algebra.mx monetdb5/modules/kernel/array.mx monetdb5/modules/kernel/bat5.mx monetdb5/modules/kernel/batcast.mx monetdb5/modules/kernel/calc.mx monetdb5/modules/kernel/counters.mx monetdb5/modules/kernel/lock.mx monetdb5/modules/kernel/logger.mx monetdb5/modules/kernel/microbenchmark.mx monetdb5/modules/kernel/mmath.mx monetdb5/modules/kernel/sema.mx monetdb5/modules/kernel/unix.mx monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/batExtensions.mx monetdb5/modules/mal/bbp.mx monetdb5/modules/mal/bpm.mx monetdb5/modules/mal/clients.mx monetdb5/modules/mal/cluster.mx monetdb5/modules/mal/groupby.mx monetdb5/modules/mal/mal_init.mx monetdb5/modules/mal/mal_mapi.mx monetdb5/modules/mal/mat.mx monetdb5/modules/mal/mdb.mx monetdb5/modules/mal/mkey.mx monetdb5/modules/mal/pcre.mx monetdb5/modules/mal/pma.mx monetdb5/modules/mal/pqueue.mx monetdb5/modules/mal/recycle.mx monetdb5/modules/mal/remote.mx monetdb5/modules/mal/tablet.mx monetdb5/modules/mal/tablet_si.mx monetdb5/modules/mal/tokenizer.mx monetdb5/modules/mal/trader.mx monetdb5/modules/mal/urlbox.mx monetdb5/optimizer/Makefile.ag monetdb5/optimizer/opt_accumulators.mx monetdb5/optimizer/opt_commonTerms.mx monetdb5/optimizer/opt_constants.mx monetdb5/optimizer/opt_costModel.mx monetdb5/optimizer/opt_dataflow.mx monetdb5/optimizer/opt_dictionary.mx monetdb5/optimizer/opt_emptySet.mx monetdb5/optimizer/opt_heuristics.mx monetdb5/optimizer/opt_inline.mx monetdb5/optimizer/opt_joinpath.mx monetdb5/optimizer/opt_mergetable.mx monetdb5/optimizer/opt_mitosis.mx monetdb5/optimizer/opt_multiplex.mx monetdb5/optimizer/opt_octopus.mx monetdb5/optimizer/opt_origin.mx monetdb5/optimizer/opt_pipes.mx monetdb5/optimizer/opt_prelude.mx monetdb5/optimizer/opt_qep.mx monetdb5/optimizer/opt_reorder.mx monetdb5/optimizer/opt_support.mx monetdb5/optimizer/optimizerWrapper.mx monetdb5/scheduler/Makefile.ag monetdb5/scheduler/run_octopus.mx monetdb5/scheduler/run_pipeline.mx sql/backends/monet5/LSST/80_lsst.mal sql/backends/monet5/LSST/Makefile.ag sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/LSST/lsst.mal sql/backends/monet5/LSST/lsst.sql sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/80_udf.mal sql/backends/monet5/UDF/80_udf.sql sql/backends/monet5/UDF/Makefile.ag sql/backends/monet5/UDF/udf.c sql/backends/monet5/UDF/udf.h sql/backends/monet5/UDF/udf.mal sql/backends/monet5/datacell/50_datacell.mal sql/backends/monet5/datacell/50_datacell.sql sql/backends/monet5/datacell/Makefile.ag sql/backends/monet5/datacell/README sql/backends/monet5/datacell/actuator.c sql/backends/monet5/datacell/basket.c sql/backends/monet5/datacell/basket.h sql/backends/monet5/datacell/basket.mal sql/backends/monet5/datacell/datacell.c sql/backends/monet5/datacell/datacell.h sql/backends/monet5/datacell/datacell.mal sql/backends/monet5/datacell/dcoperator.c sql/backends/monet5/datacell/dcoperator.h sql/backends/monet5/datacell/dcoperator.mal sql/backends/monet5/datacell/dcsocket.c sql/backends/monet5/datacell/dcsocket.h sql/backends/monet5/datacell/emitter.c sql/backends/monet5/datacell/emitter.h sql/backends/monet5/datacell/emitter.mal sql/backends/monet5/datacell/opt_datacell.c sql/backends/monet5/datacell/opt_datacell.h sql/backends/monet5/datacell/opt_datacell.mal sql/backends/monet5/datacell/petrinet.c sql/backends/monet5/datacell/petrinet.h sql/backends/monet5/datacell/petrinet.mal sql/backends/monet5/datacell/receptor.c sql/backends/monet5/datacell/receptor.h sql/backends/monet5/datacell/receptor.mal sql/backends/monet5/datacell/sensor.c sql/backends/monet5/sql.mx sql/backends/monet5/sql_emptyset.c sql/backends/monet5/sql_emptyset.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_readline.c sql/backends/monet5/sql_readline.h sql/backends/monet5/sql_result.mx sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/sql_user.c sql/backends/monet5/sql_user.h sql/backends/monet5/vaults/Makefile.ag sql/backends/monet5/vaults/fits.c sql/backends/monet5/vaults/fits.h sql/backends/monet5/vaults/fits.mal sql/backends/monet5/vaults/mseed.c sql/backends/monet5/vaults/mseed.h sql/backends/monet5/vaults/mseed.mal sql/backends/monet5/vaults/vault.c sql/backends/monet5/vaults/vault.h sql/backends/monet5/vaults/vault.mal sql/backends/monet5/vaults/vault.sql sql/benchmarks/tpch/load.sh sql/common/sql_string.c sql/common/sql_string.h sql/common/sql_types.c sql/include/sql_relation.h sql/server/Makefile.ag sql/server/bin_optimizer.c sql/server/rel_bin.c sql/server/rel_dump.c sql/server/rel_dump.h sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_prop.c sql/server/rel_prop.h sql/server/rel_schema.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_updates.c sql/server/rel_updates.h sql/server/rel_xml.c sql/server/sql_atom.c sql/server/sql_datetime.c sql/server/sql_mvc.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_psm.c sql/server/sql_qc.c sql/server/sql_rel2bin.c sql/server/sql_scan.c sql/server/sql_semantic.c sql/server/sql_statement.c sql/server/sql_statement.h sql/server/sql_symbol.c sql/sql/25_debug.sql sql/storage/Makefile.ag sql/storage/bat/bat_logger.c sql/storage/bat/bat_storage.c sql/storage/bat/bat_table.c sql/storage/bat/res_table.c sql/storage/restrict/restrict_logger.c sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c template/conf/monetdb-template-config.in template/configure.ag template/src/monetdb5/Makefile.ag template/src/monetdb5/example.c template/src/monetdb5/example.h template/src/monetdb5/example.mal testing/Mfilter.py.in testing/Mtest.py.in tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/client.c tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/handlers.c tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/peering.c tools/merovingian/daemon/proxy.c tools/merovingian/utils/database.c tools/mserver/mserver5.c Branch: Aug2011 Log Message:
Merge with Apr2011 branch. diffs (truncated from 11499 to 300 lines): diff --git a/COPYING b/COPYING --- a/COPYING +++ b/COPYING @@ -434,7 +434,7 @@ "The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/Makefile.ag b/Makefile.ag --- a/Makefile.ag +++ b/Makefile.ag @@ -1,7 +1,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -25,7 +25,7 @@ Vendor: MonetDB BV <i...@monetdb.org> Group: Applications/Databases -License: MPL - http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +License: MPL - http://www.monetdb.org/Legal/MonetDBLicense URL: http://monetdb.cwi.nl/ Source: http://dev.monetdb.org/downloads/sources/Apr2011-SP2/%{name}-%{version}.tar.bz2 diff --git a/NT/Makefile b/NT/Makefile --- a/NT/Makefile +++ b/NT/Makefile @@ -3,7 +3,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -3,7 +3,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/NT/winconfig.py b/NT/winconfig.py --- a/NT/winconfig.py +++ b/NT/winconfig.py @@ -3,7 +3,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/README b/README --- a/README +++ b/README @@ -22,7 +22,7 @@ The contents of this file are subject to the MonetDB Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at -http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +http://www.monetdb.org/Legal/MonetDBLicense Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/bootstrap b/bootstrap --- a/bootstrap +++ b/bootstrap @@ -3,7 +3,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Makefile.ag b/buildtools/Makefile.ag --- a/buildtools/Makefile.ag +++ b/buildtools/Makefile.ag @@ -1,7 +1,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Code.c b/buildtools/Mx/Code.c --- a/buildtools/Mx/Code.c +++ b/buildtools/Mx/Code.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c --- a/buildtools/Mx/Def.c +++ b/buildtools/Mx/Def.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Display.c b/buildtools/Mx/Display.c --- a/buildtools/Mx/Display.c +++ b/buildtools/Mx/Display.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Form.c b/buildtools/Mx/Form.c --- a/buildtools/Mx/Form.c +++ b/buildtools/Mx/Form.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Io.c b/buildtools/Mx/Io.c --- a/buildtools/Mx/Io.c +++ b/buildtools/Mx/Io.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Makefile.ag b/buildtools/Mx/Makefile.ag --- a/buildtools/Mx/Makefile.ag +++ b/buildtools/Mx/Makefile.ag @@ -1,7 +1,7 @@ # The contents of this file are subject to the MonetDB Public License # Version 1.1 (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at -# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +# http://www.monetdb.org/Legal/MonetDBLicense # # Software distributed under the License is distributed on an "AS IS" # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Mx.c b/buildtools/Mx/Mx.c --- a/buildtools/Mx/Mx.c +++ b/buildtools/Mx/Mx.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Mx.h b/buildtools/Mx/Mx.h --- a/buildtools/Mx/Mx.h +++ b/buildtools/Mx/Mx.h @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/MxFcnDef.h b/buildtools/Mx/MxFcnDef.h --- a/buildtools/Mx/MxFcnDef.h +++ b/buildtools/Mx/MxFcnDef.h @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Print.c b/buildtools/Mx/Print.c --- a/buildtools/Mx/Print.c +++ b/buildtools/Mx/Print.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Sys.c b/buildtools/Mx/Sys.c --- a/buildtools/Mx/Sys.c +++ b/buildtools/Mx/Sys.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/Tok.c b/buildtools/Mx/Tok.c --- a/buildtools/Mx/Tok.c +++ b/buildtools/Mx/Tok.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/disclaimer.c b/buildtools/Mx/disclaimer.c --- a/buildtools/Mx/disclaimer.c +++ b/buildtools/Mx/disclaimer.c @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/disclaimer.h b/buildtools/Mx/disclaimer.h --- a/buildtools/Mx/disclaimer.h +++ b/buildtools/Mx/disclaimer.h @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/mx-mode.el b/buildtools/Mx/mx-mode.el --- a/buildtools/Mx/mx-mode.el +++ b/buildtools/Mx/mx-mode.el @@ -1,7 +1,7 @@ ; The contents of this file are subject to the MonetDB Public License ; Version 1.1 (the "License"); you may not use this file except in ; compliance with the License. You may obtain a copy of the License at -; http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html +; http://www.monetdb.org/Legal/MonetDBLicense ; ; Software distributed under the License is distributed on an "AS IS" ; basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/buildtools/Mx/mx_getopt.h b/buildtools/Mx/mx_getopt.h --- a/buildtools/Mx/mx_getopt.h +++ b/buildtools/Mx/mx_getopt.h @@ -2,7 +2,7 @@ * The contents of this file are subject to the MonetDB Public License * Version 1.1 (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at - * http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html + * http://www.monetdb.org/Legal/MonetDBLicense * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
