diff --git a/dbcon/ddlpackageproc/createtableprocessor.cpp b/dbcon/ddlpackageproc/createtableprocessor.cpp
index e0ebdb6f3..2baf090c7 100644
--- a/dbcon/ddlpackageproc/createtableprocessor.cpp
+++ b/dbcon/ddlpackageproc/createtableprocessor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp
index d94598eb7..e752f5af9 100644
--- a/dbcon/execplan/calpontsystemcatalog.cpp
+++ b/dbcon/execplan/calpontsystemcatalog.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h
index 3ef4a53b2..c382c3e50 100644
--- a/dbcon/execplan/calpontsystemcatalog.h
+++ b/dbcon/execplan/calpontsystemcatalog.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/execplan/tdriver-sm.cpp b/dbcon/execplan/tdriver-sm.cpp
index 14307f3ee..433f1f74c 100644
--- a/dbcon/execplan/tdriver-sm.cpp
+++ b/dbcon/execplan/tdriver-sm.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/execplan/tdriver.cpp b/dbcon/execplan/tdriver.cpp
index a0d4481d4..f2c6b8d80 100644
--- a/dbcon/execplan/tdriver.cpp
+++ b/dbcon/execplan/tdriver.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/jlf_common.cpp b/dbcon/joblist/jlf_common.cpp
index c7c5470b7..c42caee56 100644
--- a/dbcon/joblist/jlf_common.cpp
+++ b/dbcon/joblist/jlf_common.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/joblist.cpp b/dbcon/joblist/joblist.cpp
index 1aab1bdfb..b191f4a12 100644
--- a/dbcon/joblist/joblist.cpp
+++ b/dbcon/joblist/joblist.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h
index c64f62833..701882dbc 100644
--- a/dbcon/joblist/joblist.h
+++ b/dbcon/joblist/joblist.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index 10f8fbd0a..99079710a 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/largehashjoin.cpp b/dbcon/joblist/largehashjoin.cpp
index 0129d6600..4394aa30d 100644
--- a/dbcon/joblist/largehashjoin.cpp
+++ b/dbcon/joblist/largehashjoin.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/joblist/tdriver-agg.cpp b/dbcon/joblist/tdriver-agg.cpp
index 59f8890c1..f498dd1ec 100644
--- a/dbcon/joblist/tdriver-agg.cpp
+++ b/dbcon/joblist/tdriver-agg.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp
index 2103cb103..31b08451c 100755
--- a/dbcon/mysql/ha_calpont.cpp
+++ b/dbcon/mysql/ha_calpont.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h
index 5db3e07cb..8aafcb08b 100755
--- a/dbcon/mysql/ha_calpont.h
+++ b/dbcon/mysql/ha_calpont.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_ddl.cpp b/dbcon/mysql/ha_calpont_ddl.cpp
index acad2100b..78027398d 100755
--- a/dbcon/mysql/ha_calpont_ddl.cpp
+++ b/dbcon/mysql/ha_calpont_ddl.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_dml.cpp b/dbcon/mysql/ha_calpont_dml.cpp
index 017b1f4b0..ce93e3720 100755
--- a/dbcon/mysql/ha_calpont_dml.cpp
+++ b/dbcon/mysql/ha_calpont_dml.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 026af72f7..e1dfef686 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 91b382413..39b58ce96 100755
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_impl.h b/dbcon/mysql/ha_calpont_impl.h
index 8e03f7806..58f680a41 100644
--- a/dbcon/mysql/ha_calpont_impl.h
+++ b/dbcon/mysql/ha_calpont_impl.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_impl_if.h b/dbcon/mysql/ha_calpont_impl_if.h
index 657f1a763..8132a8070 100644
--- a/dbcon/mysql/ha_calpont_impl_if.h
+++ b/dbcon/mysql/ha_calpont_impl_if.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_partition.cpp b/dbcon/mysql/ha_calpont_partition.cpp
index 39713f3cc..585a45b56 100755
--- a/dbcon/mysql/ha_calpont_partition.cpp
+++ b/dbcon/mysql/ha_calpont_partition.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_calpont_udf.cpp b/dbcon/mysql/ha_calpont_udf.cpp
index 3f088b13f..b33d54279 100755
--- a/dbcon/mysql/ha_calpont_udf.cpp
+++ b/dbcon/mysql/ha_calpont_udf.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_exists_sub.cpp b/dbcon/mysql/ha_exists_sub.cpp
index 9659b0a96..e8bb13941 100755
--- a/dbcon/mysql/ha_exists_sub.cpp
+++ b/dbcon/mysql/ha_exists_sub.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_from_sub.cpp b/dbcon/mysql/ha_from_sub.cpp
index a5c1cef42..0dd9eeb0e 100755
--- a/dbcon/mysql/ha_from_sub.cpp
+++ b/dbcon/mysql/ha_from_sub.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_in_sub.cpp b/dbcon/mysql/ha_in_sub.cpp
index cb406ba66..e0a097345 100755
--- a/dbcon/mysql/ha_in_sub.cpp
+++ b/dbcon/mysql/ha_in_sub.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_scalar_sub.cpp b/dbcon/mysql/ha_scalar_sub.cpp
index 7e7a3459e..7d2fc074f 100755
--- a/dbcon/mysql/ha_scalar_sub.cpp
+++ b/dbcon/mysql/ha_scalar_sub.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_select_sub.cpp b/dbcon/mysql/ha_select_sub.cpp
index a0e4ec37f..59ccaaf1c 100755
--- a/dbcon/mysql/ha_select_sub.cpp
+++ b/dbcon/mysql/ha_select_sub.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_subquery.h b/dbcon/mysql/ha_subquery.h
index 4a34d3f88..ae299b6dc 100755
--- a/dbcon/mysql/ha_subquery.h
+++ b/dbcon/mysql/ha_subquery.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_view.cpp b/dbcon/mysql/ha_view.cpp
index a99573fa0..82d1d925c 100755
--- a/dbcon/mysql/ha_view.cpp
+++ b/dbcon/mysql/ha_view.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/dbcon/mysql/ha_window_function.cpp b/dbcon/mysql/ha_window_function.cpp
index 2d17965c4..4081baffd 100755
--- a/dbcon/mysql/ha_window_function.cpp
+++ b/dbcon/mysql/ha_window_function.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/exemgr/main.cpp b/exemgr/main.cpp
index e3fcaea3b..002ba6aab 100644
--- a/exemgr/main.cpp
+++ b/exemgr/main.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oam/install_scripts/binary_installer.sh b/oam/install_scripts/binary_installer.sh
index 51c1f116d..2a79e05e9 100644
--- a/oam/install_scripts/binary_installer.sh
+++ b/oam/install_scripts/binary_installer.sh
@@ -51,7 +51,7 @@ if { $INSTALLTYPE == "initial" || $INSTALLTYPE == "uninstall" } {
 	#
 	# remove MariaDB Columnstore files
 	#
-	send_user "Uninstall MariabDB Columnstore Package                       "
+	send_user "Uninstall MariaDB Columnstore Package                       "
 	send " \n"
 	send date\n
 	send "ssh $USERNAME@$SERVER 'rm -f /etc/init.d/columnstore /etc/init.d/mysql-Columnstore $INSTALLDIR/releasenum >/dev/null 2>&1'\n"
@@ -69,12 +69,12 @@ if { $INSTALLTYPE == "initial" || $INSTALLTYPE == "uninstall" } {
 		"passphrase" { send "$PASSWORD\n" }
 		"Permission denied, please try again"   { send_user "ERROR: Invalid password\n" ; exit 1 }
 		"No route to host"   { send_user "ERROR: No route to host\n" ; exit 1 }
-		"MariabDB Columnstore uninstall completed"	{ send_user "DONE" }
+		"MariaDB Columnstore uninstall completed"	{ send_user "DONE" }
 	}
 	set timeout 30
 	expect {
 		"Read-only file system" { send_user "ERROR: local disk - Read-only file system\n" ; exit 1}
-		"MariabDB Columnstore uninstall completed"	{ send_user "DONE" }
+		"MariaDB Columnstore uninstall completed"	{ send_user "DONE" }
 	}
 	send_user "\n"
 }
@@ -83,9 +83,9 @@ if { $INSTALLTYPE == "uninstall" } {
 }
 sleep 10
 # 
-# send the MariabDB Columnstore package
+# send the MariaDB Columnstore package
 #
-send_user "Copy New MariabDB Columnstore Package to Module              "
+send_user "Copy New MariaDB Columnstore Package to Module              "
 send " \n"
 send date\n
 send "scp $CALPONTPKG $USERNAME@$SERVER:$CALPONTPKG\n"
@@ -114,7 +114,7 @@ sleep 5
 #
 # install package
 #
-send_user "Install MariabDB Columnstore Package on Module               "
+send_user "Install MariaDB Columnstore Package on Module               "
 send " \n"
 send date\n
 send "ssh $USERNAME@$SERVER 'tar -C $PREFIX --exclude db -zxf $CALPONTPKG;cat $INSTALLDIR/releasenum'\n"
@@ -134,7 +134,7 @@ expect {
 	"No route to host"   { send_user "ERROR: No route to host\n" ; exit 1 }
 	timeout { send_user "ERROR: Timeout\n" ; exit 1 }
 }
-#sleep to give time for cat MariabDB Columnstore/releasenum to complete
+#sleep to give time for cat MariaDB Columnstore/releasenum to complete
 sleep 5
 
 send_user "\n"
@@ -165,7 +165,7 @@ if { $INSTALLTYPE == "initial"} {
 	#
 	# copy over calpont config file
 	#
-	send_user "Copy MariabDB Columnstore Config file to Module              "
+	send_user "Copy MariaDB Columnstore Config file to Module              "
 	send " \n"
 	send date\n
 	send "scp $INSTALLDIR/etc/* $USERNAME@$SERVER:$INSTALLDIR/etc\n"
@@ -209,7 +209,7 @@ if { $INSTALLTYPE == "initial"} {
 	#
 	# copy over calpont OS files
 	#
-	send_user "Copy MariabDB Columnstore OS files to Module                 "
+	send_user "Copy MariaDB Columnstore OS files to Module                 "
 	send " \n"
 	send date\n
 	send "scp $INSTALLDIR/local/etc/$MODULE/*  $USERNAME@$SERVER:$INSTALLDIR/local\n"
diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp
index 72456844b..89c90c487 100644
--- a/oam/oamcpp/liboamcpp.cpp
+++ b/oam/oamcpp/liboamcpp.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h
index b17ce752f..eb4466cb8 100644
--- a/oam/oamcpp/liboamcpp.h
+++ b/oam/oamcpp/liboamcpp.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp
index c4f57cf19..43ddf73ac 100644
--- a/oam/oamcpp/oamcache.cpp
+++ b/oam/oamcpp/oamcache.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oam/oamcpp/oamcache.h b/oam/oamcpp/oamcache.h
index 44561aa0a..b3f3b293e 100644
--- a/oam/oamcpp/oamcache.h
+++ b/oam/oamcpp/oamcache.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oam/replaytxnlog/replaytxnlog.cpp b/oam/replaytxnlog/replaytxnlog.cpp
index 032f2eda0..51abaf14e 100644
--- a/oam/replaytxnlog/replaytxnlog.cpp
+++ b/oam/replaytxnlog/replaytxnlog.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/columnstoreDB/columnstoreDB.cpp b/oamapps/columnstoreDB/columnstoreDB.cpp
index 4faab87f8..0bd0078db 100644
--- a/oamapps/columnstoreDB/columnstoreDB.cpp
+++ b/oamapps/columnstoreDB/columnstoreDB.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2014 Columnstore, Inc.
+/* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporation
 
    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/oamapps/columnstoreSupport/columnstoreSupport.cpp b/oamapps/columnstoreSupport/columnstoreSupport.cpp
index bc7592031..50e7eb976 100644
--- a/oamapps/columnstoreSupport/columnstoreSupport.cpp
+++ b/oamapps/columnstoreSupport/columnstoreSupport.cpp
@@ -1,5 +1,5 @@
-/* Copyright (C) 2013 Columnstore Corp. */
-
+/* Copyright (C) 2013 Calpont Corp. */
+/* Copyright (C) 2016 MariaDB Corporation */ 
 
 /******************************************************************************************
 * $Id: columnstoreSupport.cpp 64 2006-10-12 22:21:51Z dhill $
diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp
index 8b7018eea..16d35145b 100644
--- a/oamapps/mcsadmin/mcsadmin.cpp
+++ b/oamapps/mcsadmin/mcsadmin.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2014 MariaDB Columnstore, Inc.
+/* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporation
 
    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/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h
index b5801d7f3..daf2b05e7 100644
--- a/oamapps/mcsadmin/mcsadmin.h
+++ b/oamapps/mcsadmin/mcsadmin.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/amazonInstaller.cpp b/oamapps/postConfigure/amazonInstaller.cpp
index ad13cfda9..df5c55c89 100644
--- a/oamapps/postConfigure/amazonInstaller.cpp
+++ b/oamapps/postConfigure/amazonInstaller.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/helpers.cpp b/oamapps/postConfigure/helpers.cpp
index 7ba7e1e6f..e8793b156 100644
--- a/oamapps/postConfigure/helpers.cpp
+++ b/oamapps/postConfigure/helpers.cpp
@@ -1,5 +1,5 @@
-/* Copyright (C) 2014 MariDB Columnstore, Inc.
-
+/* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporation
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
    as published by the Free Software Foundation; version 2 of
diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h
index c7df2e83e..61de9bb4b 100644
--- a/oamapps/postConfigure/helpers.h
+++ b/oamapps/postConfigure/helpers.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp
index 56600cd59..cf9f2db6a 100644
--- a/oamapps/postConfigure/installer.cpp
+++ b/oamapps/postConfigure/installer.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp
index ec0701773..7eb7c710f 100644
--- a/oamapps/postConfigure/mycnfUpgrade.cpp
+++ b/oamapps/postConfigure/mycnfUpgrade.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/patchInstaller.cpp b/oamapps/postConfigure/patchInstaller.cpp
index e4302b37a..757d89a31 100644
--- a/oamapps/postConfigure/patchInstaller.cpp
+++ b/oamapps/postConfigure/patchInstaller.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/postConfigure/postConfigure.cpp b/oamapps/postConfigure/postConfigure.cpp
index 0599fcd40..cdf940080 100644
--- a/oamapps/postConfigure/postConfigure.cpp
+++ b/oamapps/postConfigure/postConfigure.cpp
@@ -1,4 +1,5 @@
-/* Copyright (C) 2014 MariaDB Columnstore, Inc.
+/* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporation   
 
    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/oamapps/resourceMonitor/resourceMonitor.cpp b/oamapps/resourceMonitor/resourceMonitor.cpp
index dbeed7c99..c5a3e3d6b 100644
--- a/oamapps/resourceMonitor/resourceMonitor.cpp
+++ b/oamapps/resourceMonitor/resourceMonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp
index 627111cb9..43329b1ed 100644
--- a/oamapps/serverMonitor/cpuMonitor.cpp
+++ b/oamapps/serverMonitor/cpuMonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/serverMonitor/dbhealthMonitor.cpp b/oamapps/serverMonitor/dbhealthMonitor.cpp
index 0bbc2d81c..e6d4a77a9 100644
--- a/oamapps/serverMonitor/dbhealthMonitor.cpp
+++ b/oamapps/serverMonitor/dbhealthMonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp
index c51d79236..0fc506297 100644
--- a/oamapps/serverMonitor/diskMonitor.cpp
+++ b/oamapps/serverMonitor/diskMonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp
index 5b5d8d31f..716308e7d 100644
--- a/oamapps/serverMonitor/memoryMonitor.cpp
+++ b/oamapps/serverMonitor/memoryMonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp
index b5267628a..d3b21d875 100644
--- a/oamapps/serverMonitor/msgProcessor.cpp
+++ b/oamapps/serverMonitor/msgProcessor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/blockcache/blockrequestprocessor.cpp b/primitives/blockcache/blockrequestprocessor.cpp
index e4abffca0..f6621b13f 100644
--- a/primitives/blockcache/blockrequestprocessor.cpp
+++ b/primitives/blockcache/blockrequestprocessor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/blockcache/filebuffermgr.cpp b/primitives/blockcache/filebuffermgr.cpp
index 15d3fa185..e6cab58ac 100644
--- a/primitives/blockcache/filebuffermgr.cpp
+++ b/primitives/blockcache/filebuffermgr.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp
index dc0a9a267..26ddd3ac4 100644
--- a/primitives/blockcache/iomanager.cpp
+++ b/primitives/blockcache/iomanager.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/blockcache/stats.cpp b/primitives/blockcache/stats.cpp
index e2a291345..d5f39a98f 100644
--- a/primitives/blockcache/stats.cpp
+++ b/primitives/blockcache/stats.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp
index 9ab8a6ea0..177e57142 100644
--- a/primitives/primproc/batchprimitiveprocessor.cpp
+++ b/primitives/primproc/batchprimitiveprocessor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/primproc/bppseeder.cpp b/primitives/primproc/bppseeder.cpp
index 64ed9b136..bbf51f613 100644
--- a/primitives/primproc/bppseeder.cpp
+++ b/primitives/primproc/bppseeder.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp
index 0e2973eec..6e11c08bb 100644
--- a/primitives/primproc/primitiveserver.cpp
+++ b/primitives/primproc/primitiveserver.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h
index 2c0e839ff..564e12953 100644
--- a/primitives/primproc/primitiveserver.h
+++ b/primitives/primproc/primitiveserver.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp
index cd7c7d3b3..7fc0c36f2 100644
--- a/primitives/primproc/primproc.cpp
+++ b/primitives/primproc/primproc.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/procmgr/main.cpp b/procmgr/main.cpp
index c07576dae..b87df641d 100644
--- a/procmgr/main.cpp
+++ b/procmgr/main.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index 96d5584cd..66520df82 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/procmgr/processmanager.h b/procmgr/processmanager.h
index a25873253..5d0a71b01 100644
--- a/procmgr/processmanager.h
+++ b/procmgr/processmanager.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/procmon/main.cpp b/procmon/main.cpp
index 3bc449e95..8b0b07152 100644
--- a/procmon/main.cpp
+++ b/procmon/main.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/procmon/processmonitor.cpp b/procmon/processmonitor.cpp
index f94ea9820..adf27b4c2 100644
--- a/procmon/processmonitor.cpp
+++ b/procmon/processmonitor.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/snmpd/snmpmanager/snmpglobal.h b/snmpd/snmpmanager/snmpglobal.h
index 6d1c8d441..92935f7aa 100644
--- a/snmpd/snmpmanager/snmpglobal.h
+++ b/snmpd/snmpmanager/snmpglobal.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp
index f1920d282..12dbac4f3 100644
--- a/tools/configMgt/autoConfigure.cpp
+++ b/tools/configMgt/autoConfigure.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp
index 5a94f218f..a6ab46599 100644
--- a/tools/configMgt/autoInstaller.cpp
+++ b/tools/configMgt/autoInstaller.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp
index 3da3c403f..c14358e3b 100644
--- a/tools/configMgt/configure.cpp
+++ b/tools/configMgt/configure.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/tools/configMgt/stackReleaseChecker.cpp b/tools/configMgt/stackReleaseChecker.cpp
index 0f1bb5a6c..8bc0ef7bd 100644
--- a/tools/configMgt/stackReleaseChecker.cpp
+++ b/tools/configMgt/stackReleaseChecker.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/funcexp/func_from_unixtime.cpp b/utils/funcexp/func_from_unixtime.cpp
index 85aef442b..6d0f9be61 100644
--- a/utils/funcexp/func_from_unixtime.cpp
+++ b/utils/funcexp/func_from_unixtime.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/funcexp/func_nullif.cpp b/utils/funcexp/func_nullif.cpp
index 4123faee7..9db0f8e5b 100644
--- a/utils/funcexp/func_nullif.cpp
+++ b/utils/funcexp/func_nullif.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/loggingcpp/errorids.h b/utils/loggingcpp/errorids.h
index 0182e319c..dbd44c9f0 100644
--- a/utils/loggingcpp/errorids.h
+++ b/utils/loggingcpp/errorids.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp
index 07bb182c6..d3185f6c3 100644
--- a/utils/loggingcpp/messagelog.cpp
+++ b/utils/loggingcpp/messagelog.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/loggingcpp/tdriver.cpp b/utils/loggingcpp/tdriver.cpp
index 1f78d2a9e..3a5d02c9f 100644
--- a/utils/loggingcpp/tdriver.cpp
+++ b/utils/loggingcpp/tdriver.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/startup/installdir.cpp b/utils/startup/installdir.cpp
index cb1150aa5..cc52eb6fc 100644
--- a/utils/startup/installdir.cpp
+++ b/utils/startup/installdir.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/testbc/stats.cpp b/utils/testbc/stats.cpp
index c797fd6b4..85d5e9a7d 100644
--- a/utils/testbc/stats.cpp
+++ b/utils/testbc/stats.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/udfsdk/udfinfinidb.cpp b/utils/udfsdk/udfinfinidb.cpp
index 037ea50e1..c6bbf2408 100644
--- a/utils/udfsdk/udfinfinidb.cpp
+++ b/utils/udfsdk/udfinfinidb.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/udfsdk/udfsdk.h b/utils/udfsdk/udfsdk.h
index 10a300e8d..659cb837c 100644
--- a/utils/udfsdk/udfsdk.h
+++ b/utils/udfsdk/udfsdk.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp
index 19bc12325..0c87495ab 100644
--- a/versioning/BRM/slavecomm.cpp
+++ b/versioning/BRM/slavecomm.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/versioning/BRM/tracer.cpp b/versioning/BRM/tracer.cpp
index 8895c3791..33693f62f 100644
--- a/versioning/BRM/tracer.cpp
+++ b/versioning/BRM/tracer.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/writeengine/redistribute/we_redistributecontrol.cpp b/writeengine/redistribute/we_redistributecontrol.cpp
index c4b709849..187bceb23 100644
--- a/writeengine/redistribute/we_redistributecontrol.cpp
+++ b/writeengine/redistribute/we_redistributecontrol.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/writeengine/redistribute/we_redistributecontrolthread.cpp b/writeengine/redistribute/we_redistributecontrolthread.cpp
index d83638522..94b21bf29 100644
--- a/writeengine/redistribute/we_redistributecontrolthread.cpp
+++ b/writeengine/redistribute/we_redistributecontrolthread.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp
index 160a295bf..52c9c0b2f 100644
--- a/writeengine/splitter/we_cmdargs.cpp
+++ b/writeengine/splitter/we_cmdargs.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 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/writeengine/wrapper/tdriver.cpp b/writeengine/wrapper/tdriver.cpp
index df32c2734..c1ad24731 100644
--- a/writeengine/wrapper/tdriver.cpp
+++ b/writeengine/wrapper/tdriver.cpp
@@ -1,4 +1,5 @@
 /* Copyright (C) 2014 InfiniDB, Inc.
+   Copyright (C) 2016 MariaDB Corporaton
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License