From: Ole John Aske Date: March 31 2011 7:44am Subject: bzr push into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (ole.john.aske:3468 to 3469) List-Archive: http://lists.mysql.com/commits/134337 Message-Id: <20110331074419.423A4218@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3469 Ole John Aske 2011-03-31 Added or updated Copyright info for files added as part of the SPJ project. .... Recommit after resolving merge conflicts... 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 3468 jonas oreland 2011-03-31 [merge] ndb - merge 70 to 70-spj modified: configure.in storage/ndb/ndb_configure.m4 storage/ndb/src/common/util/version.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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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:44:04 +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 No bundle (reason: useless for push emails).