Changeset: e3aa1ec37df8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e3aa1ec37df8 Modified Files: clients/php/Makefile.ag monetdb5/modules/kernel/Makefile.ag monetdb5/modules/mal/Makefile.ag monetdb5/modules/mal/array.mx monetdb5/modules/mal/mal_init.mx sql/backends/monet5/Makefile.ag sql/backends/monet5/sciql.c sql/backends/monet5/sciql.h sql/backends/monet5/sciql.mal sql/backends/monet5/sql.mx sql/backends/monet5/sql_user.c sql/backends/monet5/vaults/mseed.c sql/include/sql_catalog.h sql/include/sql_relation.h sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_schema.c sql/server/rel_semantic.c sql/server/sql_mvc.c sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_scan.c sql/sql/29_array.sql sql/sql/Makefile.ag sql/storage/store.c testing/Makefile.ag Branch: sciql Log Message:
Merge with default branch. diffs (truncated from 11559 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
