List:Commits« Previous MessageNext Message »
From:Kent Boortz Date:January 30 2011 11:16pm
Subject:bzr commit into mysql-5.1-telco-7.1 branch (kent.boortz:4058)
View as plain text  
#At file:///net/helheim/store/bteam/bzr/kent/copyright-work/repos/mysql-7.1.10-release/ based on revid:kent.boortz@stripped

 4058 Kent Boortz	2011-01-31 [merge]
      Updated/added copyright headers

    modified:
      storage/ndb/include/kernel/signaldata/ConfigChange.hpp
      storage/ndb/include/mgmcommon/IPCConfig.hpp
      storage/ndb/include/portlib/NdbDir.hpp
      storage/ndb/include/portlib/ndb_daemon.h
      storage/ndb/include/util/HashMap.hpp
      storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp
      storage/ndb/src/common/logger/message.h
      storage/ndb/src/common/mgmcommon/IPCConfig.cpp
      storage/ndb/src/common/portlib/NdbDir.cpp
      storage/ndb/src/common/portlib/ndb_daemon.cc
      storage/ndb/src/common/util/ndb_opts.c
      storage/ndb/src/common/util/require.c
      storage/ndb/src/kernel/angel.cpp
      storage/ndb/src/kernel/angel.hpp
      storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/ndbd.hpp
      storage/ndb/src/kernel/vm/dummy_mt.cpp
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
      storage/ndb/src/mgmsrv/ConfigManager.hpp
      storage/ndb/src/ndbapi/trp_client.cpp
      storage/ndb/test/run-test/CMakeLists.txt
      storage/ndb/test/run-test/create_mtr_suites.pl
=== modified file 'storage/ndb/include/kernel/signaldata/ConfigChange.hpp'
--- a/storage/ndb/include/kernel/signaldata/ConfigChange.hpp	2010-09-21 06:04:04 +0000
+++ b/storage/ndb/include/kernel/signaldata/ConfigChange.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/include/mgmcommon/IPCConfig.hpp'
--- a/storage/ndb/include/mgmcommon/IPCConfig.hpp	2010-12-15 06:07:35 +0000
+++ b/storage/ndb/include/mgmcommon/IPCConfig.hpp	2011-01-30 23:13:49 +0000
@@ -1,6 +1,5 @@
 /* 
-   Copyright (C) 2003-2008 MySQL AB, Sun Microsystems Inc.
-    All rights reserved. Use is subject to license terms.
+   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/include/portlib/NdbDir.hpp'
--- a/storage/ndb/include/portlib/NdbDir.hpp	2010-11-18 10:03:45 +0000
+++ b/storage/ndb/include/portlib/NdbDir.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/include/portlib/ndb_daemon.h'
--- a/storage/ndb/include/portlib/ndb_daemon.h	2010-06-16 12:06:41 +0000
+++ b/storage/ndb/include/portlib/ndb_daemon.h	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/include/util/HashMap.hpp'
--- a/storage/ndb/include/util/HashMap.hpp	2010-09-21 07:36:08 +0000
+++ b/storage/ndb/include/util/HashMap.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Sun Microsystems Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp'
--- a/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp	2010-05-03 04:49:08 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTrigImpl.cpp	2011-01-30 23:13:49 +0000
@@ -2,8 +2,7 @@
 
    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; either version 2 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; version 2 of the License.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of

=== modified file 'storage/ndb/src/common/logger/message.h'
--- a/storage/ndb/src/common/logger/message.h	2010-04-07 09:14:43 +0000
+++ b/storage/ndb/src/common/logger/message.h	2011-01-30 23:13:49 +0000
@@ -1,4 +1,21 @@
 /*
+   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+/*
   To change or add messages ndbd or ndb_mgmd writes to the Windows
   error log, run
    mc.exe message.mc

=== modified file 'storage/ndb/src/common/mgmcommon/IPCConfig.cpp'
--- a/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2010-12-15 06:07:35 +0000
+++ b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2011-01-30 23:13:49 +0000
@@ -1,6 +1,5 @@
 /* 
-   Copyright (C) 2003-2008 MySQL AB, Sun Microsystems Inc.
-    All rights reserved. Use is subject to license terms.
+   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/common/portlib/NdbDir.cpp'
--- a/storage/ndb/src/common/portlib/NdbDir.cpp	2010-11-30 07:47:55 +0000
+++ b/storage/ndb/src/common/portlib/NdbDir.cpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/common/portlib/ndb_daemon.cc'
--- a/storage/ndb/src/common/portlib/ndb_daemon.cc	2010-11-17 10:20:39 +0000
+++ b/storage/ndb/src/common/portlib/ndb_daemon.cc	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/common/util/ndb_opts.c'
--- a/storage/ndb/src/common/util/ndb_opts.c	2010-11-17 10:01:47 +0000
+++ b/storage/ndb/src/common/util/ndb_opts.c	2011-01-30 23:13:49 +0000
@@ -1,3 +1,20 @@
+/*
+   Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #define OPTEXPORT
 #include <ndb_opts.h>
 

=== modified file 'storage/ndb/src/common/util/require.c'
--- a/storage/ndb/src/common/util/require.c	2009-12-03 11:39:48 +0000
+++ b/storage/ndb/src/common/util/require.c	2011-01-30 23:13:49 +0000
@@ -1,3 +1,21 @@
+/*
+   Copyright 2009 Sun Microsystems, Inc.
+    All rights reserved. Use is subject to license terms.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include <ndb_global.h>
 
 void require_failed(int exitcode, RequirePrinter printer,

=== modified file 'storage/ndb/src/kernel/angel.cpp'
--- a/storage/ndb/src/kernel/angel.cpp	2010-11-03 14:01:49 +0000
+++ b/storage/ndb/src/kernel/angel.cpp	2011-01-30 23:15:47 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/kernel/angel.hpp'
--- a/storage/ndb/src/kernel/angel.hpp	2010-11-03 11:09:03 +0000
+++ b/storage/ndb/src/kernel/angel.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp'
--- a/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp	2010-01-15 11:15:33 +0000
+++ b/storage/ndb/src/kernel/blocks/dbinfo/Dbinfo.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2008 MySQL AB, 2009-2010 Sun Microsystems Inc.
+/* Copyright 2008-2010 Sun Microsystems, Inc.
    All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify

=== modified file 'storage/ndb/src/kernel/ndbd.cpp'
--- a/storage/ndb/src/kernel/ndbd.cpp	2010-12-20 10:33:24 +0000
+++ b/storage/ndb/src/kernel/ndbd.cpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/kernel/ndbd.hpp'
--- a/storage/ndb/src/kernel/ndbd.hpp	2010-05-05 15:27:29 +0000
+++ b/storage/ndb/src/kernel/ndbd.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/kernel/vm/dummy_mt.cpp'
--- a/storage/ndb/src/kernel/vm/dummy_mt.cpp	2008-01-01 12:45:11 +0000
+++ b/storage/ndb/src/kernel/vm/dummy_mt.cpp	2011-01-30 23:13:49 +0000
@@ -1,3 +1,21 @@
+/*
+   Copyright (C) 2008 MySQL AB
+    All rights reserved. Use is subject to license terms.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include "FastScheduler.hpp"
 #include "RefConvert.hpp"
 

=== modified file 'storage/ndb/src/kernel/vm/dummy_nonmt.cpp'
--- a/storage/ndb/src/kernel/vm/dummy_nonmt.cpp	2009-01-23 14:21:31 +0000
+++ b/storage/ndb/src/kernel/vm/dummy_nonmt.cpp	2011-01-30 23:13:49 +0000
@@ -1,3 +1,21 @@
+/*
+   Copyright (C) 2008 MySQL AB, 2008, 2009 Sun Microsystems, Inc.
+    All rights reserved. Use is subject to license terms.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include <assert.h>
 #include <ndb_types.h>
 

=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-01-11 19:13:37 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.cpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008-2009 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/mgmsrv/ConfigManager.hpp'
--- a/storage/ndb/src/mgmsrv/ConfigManager.hpp	2010-09-17 14:30:59 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigManager.hpp	2011-01-30 23:13:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008 Sun Microsystems, Inc.
+/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 
    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

=== modified file 'storage/ndb/src/ndbapi/trp_client.cpp'
--- a/storage/ndb/src/ndbapi/trp_client.cpp	2011-01-12 08:04:39 +0000
+++ b/storage/ndb/src/ndbapi/trp_client.cpp	2011-01-30 23:13:49 +0000
@@ -1,3 +1,20 @@
+/*
+   Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+   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 the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   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 St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
 #include "trp_client.hpp"
 #include "TransporterFacade.hpp"
 

=== modified file 'storage/ndb/test/run-test/CMakeLists.txt'
--- a/storage/ndb/test/run-test/CMakeLists.txt	2010-11-17 11:35:04 +0000
+++ b/storage/ndb/test/run-test/CMakeLists.txt	2011-01-30 23:13:49 +0000
@@ -1,5 +1,4 @@
-# Copyright (C) 2009 Sun Microsystems
-#  All rights reserved. Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
 # 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

=== modified file 'storage/ndb/test/run-test/create_mtr_suites.pl'
--- a/storage/ndb/test/run-test/create_mtr_suites.pl	2009-03-13 13:34:10 +0000
+++ b/storage/ndb/test/run-test/create_mtr_suites.pl	2011-01-30 23:13:49 +0000
@@ -1,6 +1,22 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
+# Copyright 2009 Sun Microsystems, Inc.
+#  All rights reserved. Use is subject to license terms.
+#
+# 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 the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# 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 St, Fifth Floor, Boston, MA  02110-1301  USA
+
 use strict;
 use warnings;
 use IO::File;


Attachment: [text/bzr-bundle] bzr/kent.boortz@oracle.com-20110130231547-mmuldao2723jand9.bundle
Thread
bzr commit into mysql-5.1-telco-7.1 branch (kent.boortz:4058) Kent Boortz31 Jan