From: Ole John Aske Date: March 31 2011 7:41am Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3468) List-Archive: http://lists.mysql.com/commits/134335 Message-Id: <20110331074158.2EF1D218@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0584578000166253714==" --===============0584578000166253714== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped 3468 Ole John Aske 2011-03-31 SPJ: Added or updated Copyright info for files added as part of the SPJ project. modified: sql/ha_ndbcluster_push.cc sql/ha_ndbcluster_push.h storage/ndb/src/ndbapi/NdbQueryBuilder.cpp storage/ndb/src/ndbapi/NdbQueryBuilder.hpp storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbQueryOperation.hpp storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp storage/ndb/test/ndbapi/testSpj.cpp storage/ndb/test/tools/hugoJoin.cpp storage/ndb/test/tools/spj_performance_test.cpp storage/ndb/test/tools/spj_sanity_test.cpp storage/ndb/test/tools/test_spj.cpp === modified file 'sql/ha_ndbcluster_push.cc' --- a/sql/ha_ndbcluster_push.cc 2011-03-30 10:54:30 +0000 +++ b/sql/ha_ndbcluster_push.cc 2011-03-31 07:41:53 +0000 @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved. +/* + 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 === modified file 'sql/ha_ndbcluster_push.h' --- a/sql/ha_ndbcluster_push.h 2011-01-18 08:17:07 +0000 +++ b/sql/ha_ndbcluster_push.h 2011-03-31 07:41:53 +0000 @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved. +/* + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.cpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilder.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilder.hpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2011-02-11 13:12:09 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperation.hpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.hpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2011-02-24 14:16:51 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp 2011-03-31 07:41:53 +0000 @@ -1,7 +1,5 @@ /* - Copyright (C) 2009 Sun Microsystems Inc - All rights reserved. Use is subject to license terms. - + 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 === modified file 'storage/ndb/test/ndbapi/testSpj.cpp' --- a/storage/ndb/test/ndbapi/testSpj.cpp 2010-05-20 11:18:08 +0000 +++ b/storage/ndb/test/ndbapi/testSpj.cpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2003 MySQL AB - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/test/tools/hugoJoin.cpp' --- a/storage/ndb/test/tools/hugoJoin.cpp 2010-11-09 13:03:09 +0000 +++ b/storage/ndb/test/tools/hugoJoin.cpp 2011-03-31 07:41:53 +0000 @@ -1,6 +1,5 @@ /* - Copyright (C) 2003 MySQL AB - All rights reserved. Use is subject to license terms. + 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 === modified file 'storage/ndb/test/tools/spj_performance_test.cpp' --- a/storage/ndb/test/tools/spj_performance_test.cpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/test/tools/spj_performance_test.cpp 2011-03-31 07:41:53 +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 #include #include === modified file 'storage/ndb/test/tools/spj_sanity_test.cpp' --- a/storage/ndb/test/tools/spj_sanity_test.cpp 2011-03-30 13:26:02 +0000 +++ b/storage/ndb/test/tools/spj_sanity_test.cpp 2011-03-31 07:41:53 +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 #include #include === modified file 'storage/ndb/test/tools/test_spj.cpp' --- a/storage/ndb/test/tools/test_spj.cpp 2010-10-04 15:33:44 +0000 +++ b/storage/ndb/test/tools/test_spj.cpp 2011-03-31 07:41:53 +0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2003 MySQL AB +/* + 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 --===============0584578000166253714== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/ole.john.aske@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@stripped\ # etegzfnk36eldcq1 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 0ec47409d4582f6467bf413f04f7676400ec1010 # timestamp: 2011-03-31 09:41:58 +0200 # source_branch: bzr+ssh://oaske@stripped/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: jonas@stripped # # Begin bundle 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 --===============0584578000166253714==--