Changeset: 365417e05fea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=365417e05fea Modified Files: monetdb5/extras/rapi/converters.c.h sql/backends/monet5/UDF/capi/cheader.h sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal sql/backends/monet5/UDF/pyapi3/Makefile.ag sql/backends/monet5/UDF/pyapi3/connection3.c sql/backends/monet5/UDF/pyapi3/conversion3.c sql/backends/monet5/UDF/pyapi3/emit3.c sql/backends/monet5/UDF/pyapi3/formatinput3.c sql/backends/monet5/UDF/pyapi3/pyapi3.c sql/backends/monet5/UDF/pyapi3/pyapi3.mal sql/backends/monet5/UDF/pyapi3/pyloader3.c sql/backends/monet5/UDF/pyapi3/pytypes3.c sql/backends/monet5/UDF/pyapi3/type_conversion3.c sql/backends/monet5/UDF/pyapi3/unicode3.c tools/mserver/shutdowntest.c Branch: default Log Message:
Merge with Jul2017 branch. diffs (213 lines): diff --git a/monetdb5/extras/rapi/converters.c.h b/monetdb5/extras/rapi/converters.c.h --- a/monetdb5/extras/rapi/converters.c.h +++ b/monetdb5/extras/rapi/converters.c.h @@ -1,3 +1,11 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ + #define RSTR(somestr) mkCharCE(somestr, CE_UTF8) diff --git a/sql/backends/monet5/UDF/capi/cheader.h b/sql/backends/monet5/UDF/capi/cheader.h --- a/sql/backends/monet5/UDF/capi/cheader.h +++ b/sql/backends/monet5/UDF/capi/cheader.h @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ #include <stdint.h> diff --git a/sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal b/sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal --- a/sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal +++ b/sql/backends/monet5/UDF/pyapi3/50_pyapi3.mal @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 2008-2015 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. # This loads the MonetDB/PyAPI module include pyapi3; diff --git a/sql/backends/monet5/UDF/pyapi3/Makefile.ag b/sql/backends/monet5/UDF/pyapi3/Makefile.ag --- a/sql/backends/monet5/UDF/pyapi3/Makefile.ag +++ b/sql/backends/monet5/UDF/pyapi3/Makefile.ag @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 2008-2015 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. INCLUDES = \ ../../../../../clients/mapilib \ @@ -19,7 +19,6 @@ INCLUDES = \ ../../../../../sql/storage \ ../pyapi \ $(libpy3_CFLAGS) - MTSAFE diff --git a/sql/backends/monet5/UDF/pyapi3/connection3.c b/sql/backends/monet5/UDF/pyapi3/connection3.c --- a/sql/backends/monet5/UDF/pyapi3/connection3.c +++ b/sql/backends/monet5/UDF/pyapi3/connection3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/conversion3.c b/sql/backends/monet5/UDF/pyapi3/conversion3.c --- a/sql/backends/monet5/UDF/pyapi3/conversion3.c +++ b/sql/backends/monet5/UDF/pyapi3/conversion3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/emit3.c b/sql/backends/monet5/UDF/pyapi3/emit3.c --- a/sql/backends/monet5/UDF/pyapi3/emit3.c +++ b/sql/backends/monet5/UDF/pyapi3/emit3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/formatinput3.c b/sql/backends/monet5/UDF/pyapi3/formatinput3.c --- a/sql/backends/monet5/UDF/pyapi3/formatinput3.c +++ b/sql/backends/monet5/UDF/pyapi3/formatinput3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi3.c b/sql/backends/monet5/UDF/pyapi3/pyapi3.c --- a/sql/backends/monet5/UDF/pyapi3/pyapi3.c +++ b/sql/backends/monet5/UDF/pyapi3/pyapi3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/pyapi3.mal b/sql/backends/monet5/UDF/pyapi3/pyapi3.mal --- a/sql/backends/monet5/UDF/pyapi3/pyapi3.mal +++ b/sql/backends/monet5/UDF/pyapi3/pyapi3.mal @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Copyright 2008-2015 MonetDB B.V. +# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. module pyapi3; diff --git a/sql/backends/monet5/UDF/pyapi3/pyloader3.c b/sql/backends/monet5/UDF/pyapi3/pyloader3.c --- a/sql/backends/monet5/UDF/pyapi3/pyloader3.c +++ b/sql/backends/monet5/UDF/pyapi3/pyloader3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/pytypes3.c b/sql/backends/monet5/UDF/pyapi3/pytypes3.c --- a/sql/backends/monet5/UDF/pyapi3/pytypes3.c +++ b/sql/backends/monet5/UDF/pyapi3/pytypes3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c --- a/sql/backends/monet5/UDF/pyapi3/type_conversion3.c +++ b/sql/backends/monet5/UDF/pyapi3/type_conversion3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/sql/backends/monet5/UDF/pyapi3/unicode3.c b/sql/backends/monet5/UDF/pyapi3/unicode3.c --- a/sql/backends/monet5/UDF/pyapi3/unicode3.c +++ b/sql/backends/monet5/UDF/pyapi3/unicode3.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ /* Python 3 UDFs use the exact same source code as Python 2 UDFs */ /* Except they are linked to a different library (Python 3/Python 2 libraries respectively) */ diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c --- a/tools/mserver/shutdowntest.c +++ b/tools/mserver/shutdowntest.c @@ -1,3 +1,10 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. + */ #include "monetdb_config.h" #include <string.h> /* strerror */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
