Skip to content

Commit aca71b7

Browse files
author
Ole John Aske
committed
Added or updated Copyright info for files added as part of the SPJ project.
.... Recommit after resolving merge conflicts...
1 parent 69c361f commit aca71b7

13 files changed

+48
-20
lines changed

‎sql/ha_ndbcluster_push.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
23
34
This program is free software; you can redistribute it and/or modify
45
it under the terms of the GNU General Public License as published by

‎sql/ha_ndbcluster_push.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
1+
/*
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
23
34
This program is free software; you can redistribute it and/or modify
45
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryBuilder.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryBuilder.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryBuilderImpl.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryOperation.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryOperation.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/src/ndbapi/NdbQueryOperationImpl.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/*
2-
Copyright (C) 2009 Sun Microsystems Inc
3-
All rights reserved. Use is subject to license terms.
4-
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
53
64
This program is free software; you can redistribute it and/or modify
75
it under the terms of the GNU General Public License as published by

‎storage/ndb/test/ndbapi/testSpj.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2003 MySQL AB
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/test/tools/hugoJoin.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/*
2-
Copyright (C) 2003 MySQL AB
3-
All rights reserved. Use is subject to license terms.
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
43
54
This program is free software; you can redistribute it and/or modify
65
it under the terms of the GNU General Public License as published by

‎storage/ndb/test/tools/spj_performance_test.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; if not, write to the Free Software
15+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
*/
17+
118
#include <assert.h>
219
#include <mysql.h>
320
#include <mysqld_error.h>

‎storage/ndb/test/tools/spj_sanity_test.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
/*
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
3+
4+
This program is free software; you can redistribute it and/or modify
5+
it under the terms of the GNU General Public License as published by
6+
the Free Software Foundation; version 2 of the License.
7+
8+
This program is distributed in the hope that it will be useful,
9+
but WITHOUT ANY WARRANTY; without even the implied warranty of
10+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+
GNU General Public License for more details.
12+
13+
You should have received a copy of the GNU General Public License
14+
along with this program; if not, write to the Free Software
15+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
16+
*/
17+
118
#include <new>
219
#include <assert.h>
320
#include <mysql.h>

‎storage/ndb/test/tools/test_spj.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/* Copyright (C) 2003 MySQL AB
1+
/*
2+
Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
23
34
This program is free software; you can redistribute it and/or modify
45
it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)