From e49edf19c89e8d2c358a9cfbff74b7551b5c5698 Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 3 Aug 2017 11:36:19 -0500 Subject: [PATCH] MCOL-523 set copyright notices --- dbcon/execplan/udafcolumn.cpp | 6 ++++-- dbcon/execplan/udafcolumn.h | 13 ++++--------- dbcon/execplan/wf_frame.h | 15 +++++---------- primitives/primproc/batchprimitiveprocessor.cpp | 2 +- utils/messageqcpp/bytestream.cpp | 12 +++++------- utils/messageqcpp/bytestream.h | 17 +++++++---------- utils/rowgroup/rowaggregation.cpp | 10 +++++----- utils/rowgroup/rowaggregation.h | 10 +++++----- utils/rowgroup/rowgroup.cpp | 13 +++++-------- utils/rowgroup/rowgroup.h | 15 +++++---------- utils/udfsdk/udfmysql.cpp | 2 +- utils/windowfunction/windowframe.cpp | 9 +++++---- utils/windowfunction/windowfunction.cpp | 10 +++++----- utils/windowfunction/windowfunctiontype.cpp | 10 +++++----- 14 files changed, 62 insertions(+), 82 deletions(-) diff --git a/dbcon/execplan/udafcolumn.cpp b/dbcon/execplan/udafcolumn.cpp index 5ca1cd985..d58c4fb97 100755 --- a/dbcon/execplan/udafcolumn.cpp +++ b/dbcon/execplan/udafcolumn.cpp @@ -1,4 +1,5 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,7 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ + MA 02110-1301, USA. + */ #include #include diff --git a/dbcon/execplan/udafcolumn.h b/dbcon/execplan/udafcolumn.h index 7034a49b3..0748b6466 100755 --- a/dbcon/execplan/udafcolumn.h +++ b/dbcon/execplan/udafcolumn.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,14 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -/*********************************************************************** -* $Id: groupconcatcolumn.h 9210 2013-01-21 14:10:42Z rdempsey $ -* -* -***********************************************************************/ -/** @file */ + MA 02110-1301, USA. +*/ #ifndef UDAFCOLUMN_H #define UDAFCOLUMN_H diff --git a/dbcon/execplan/wf_frame.h b/dbcon/execplan/wf_frame.h index 34b393b87..bab6e40d4 100755 --- a/dbcon/execplan/wf_frame.h +++ b/dbcon/execplan/wf_frame.h @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,15 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -/*********************************************************************** -* $Id: wf_frame.h 9679 2017-06-11 $ -* -* -***********************************************************************/ - -/** @file */ + MA 02110-1301, USA. +*/ #ifndef WINDOW_FUNCTION_FRAME_H #define WINDOW_FUNCTION_FRAME_H diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp index 3fbf5d848..8678e1381 100755 --- a/primitives/primproc/batchprimitiveprocessor.cpp +++ b/primitives/primproc/batchprimitiveprocessor.cpp @@ -1,5 +1,5 @@ /* Copyright (C) 2014 InfiniDB, Inc. - Copyright (C) 2016 MariaDB Corporaton + Copyright (C) 2016, 2017 MariaDB Corporaton This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/messageqcpp/bytestream.cpp b/utils/messageqcpp/bytestream.cpp index a9a212d65..548eeeb2b 100755 --- a/utils/messageqcpp/bytestream.cpp +++ b/utils/messageqcpp/bytestream.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,13 +15,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ + MA 02110-1301, USA. +*/ -/*********************************************************************** -* $Id: bytestream.cpp 3862 2013-06-05 13:29:12Z rdempsey $ -* -* -***********************************************************************/ #include #include #include diff --git a/utils/messageqcpp/bytestream.h b/utils/messageqcpp/bytestream.h index 054dfb9f5..8fc5f3a6d 100755 --- a/utils/messageqcpp/bytestream.h +++ b/utils/messageqcpp/bytestream.h @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,14 +15,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ + MA 02110-1301, USA. +*/ -/****************************************************************************************** -* $Id: bytestream.h 3861 2013-06-04 20:59:23Z dhall $ -* -* -******************************************************************************************/ -/** @file */ #ifndef MESSAGEQCPP_BYTESTREAM_H #define MESSAGEQCPP_BYTESTREAM_H @@ -145,12 +142,12 @@ public: */ EXPORT ByteStream& operator<<(const uint64_t o); /** - * push an float onto the end of the stream. The byte order is + * push a float onto the end of the stream. The byte order is * whatever the native byte order is. */ EXPORT ByteStream& operator<<(const float f); /** - * push an double onto the end of the stream. The byte order is + * push a double onto the end of the stream. The byte order is * whatever the native byte order is. */ EXPORT ByteStream& operator<<(const double d); diff --git a/utils/rowgroup/rowaggregation.cpp b/utils/rowgroup/rowaggregation.cpp index b0f239329..63c13d551 100755 --- a/utils/rowgroup/rowaggregation.cpp +++ b/utils/rowgroup/rowaggregation.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,10 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: rowaggregation.cpp 4017 2013-07-26 16:20:29Z pleblanc $ - + MA 02110-1301, USA. +*/ /** @file rowaggregation.cpp * diff --git a/utils/rowgroup/rowaggregation.h b/utils/rowgroup/rowaggregation.h index a3e938d0b..e5b230c93 100755 --- a/utils/rowgroup/rowaggregation.h +++ b/utils/rowgroup/rowaggregation.h @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,10 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: rowaggregation.h 4017 2013-07-26 16:20:29Z pleblanc $ - + MA 02110-1301, USA. +*/ #ifndef ROWAGGREGATION_H #define ROWAGGREGATION_H diff --git a/utils/rowgroup/rowgroup.cpp b/utils/rowgroup/rowgroup.cpp index cad0f34fb..519c74cea 100755 --- a/utils/rowgroup/rowgroup.cpp +++ b/utils/rowgroup/rowgroup.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,21 +15,16 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: rowgroup.cpp 4021 2013-07-26 22:08:16Z xlou $ + MA 02110-1301, USA. +*/ // // C++ Implementation: rowgroup // // Description: // -// // Author: Patrick LeBlanc , (C) 2008 // -// Copyright: See COPYING file that comes with this distribution -// -// #include //#define NDEBUG diff --git a/utils/rowgroup/rowgroup.h b/utils/rowgroup/rowgroup.h index 4eb1176dd..c2504b99a 100755 --- a/utils/rowgroup/rowgroup.h +++ b/utils/rowgroup/rowgroup.h @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,22 +15,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: rowgroup.h 4020 2013-07-26 21:41:28Z pleblanc $ + MA 02110-1301, USA. +*/ // // C++ Interface: rowgroup // // Description: // -// // Author: Patrick LeBlanc , (C) 2008 -// -// Copyright: See COPYING file that comes with this distribution -// -// -/** @file */ #ifndef ROWGROUP_H_ #define ROWGROUP_H_ diff --git a/utils/udfsdk/udfmysql.cpp b/utils/udfsdk/udfmysql.cpp index 6a8d34b28..0f1971897 100755 --- a/utils/udfsdk/udfmysql.cpp +++ b/utils/udfsdk/udfmysql.cpp @@ -168,7 +168,7 @@ void mcs_isnull_deinit(UDF_INIT* initid) } #ifdef _MSC_VER -__declspec(dllexport)f +__declspec(dllexport) #endif long long mcs_isnull(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error) { diff --git a/utils/windowfunction/windowframe.cpp b/utils/windowfunction/windowframe.cpp index 2e4c77816..49da7f6f2 100644 --- a/utils/windowfunction/windowframe.cpp +++ b/utils/windowfunction/windowframe.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,9 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: windowframe.cpp 3821 2013-05-17 23:58:16Z xlou $ + MA 02110-1301, USA. +*/ //#define NDEBUG diff --git a/utils/windowfunction/windowfunction.cpp b/utils/windowfunction/windowfunction.cpp index b16eed6f5..a3dbb1ee6 100755 --- a/utils/windowfunction/windowfunction.cpp +++ b/utils/windowfunction/windowfunction.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,10 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: windowfunction.cpp 3932 2013-06-25 16:08:10Z xlou $ - + MA 02110-1301, USA. +*/ //#define NDEBUG #include diff --git a/utils/windowfunction/windowfunctiontype.cpp b/utils/windowfunction/windowfunctiontype.cpp index af2f96b96..bf13f3d8f 100755 --- a/utils/windowfunction/windowfunctiontype.cpp +++ b/utils/windowfunction/windowfunctiontype.cpp @@ -1,4 +1,6 @@ -/* Copyright (C) 2014 InfiniDB, Inc. +/* + Copyright (c) 2017, MariaDB + Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -13,10 +15,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -// $Id: windowfunctiontype.cpp 3932 2013-06-25 16:08:10Z xlou $ - + MA 02110-1301, USA. +*/ //#define NDEBUG #include