Skip to content

Commit fb5f286

Browse files
author
Mattias Jonsson
committed
Updated copyright headers for files changed
by WL#5217. Both updating the year as well as old address of FSF.
1 parent b9b24e8 commit fb5f286

24 files changed

+96
-84
lines changed

‎include/my_base.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
/* Copyright (C) 2000, 2011, Oracle and/or its affiliates. All rights
2-
reserved
1+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
32
43
This program is free software; you can redistribute it and/or modify
54
it under the terms of the GNU General Public License as published by
@@ -12,7 +11,7 @@
1211
1312
You should have received a copy of the GNU General Public License
1413
along with this program; if not, write to the Free Software
15-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1615

1716
/* This file includes constants used with all databases */
1817

‎include/welcome_copyright_notice.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
1111
1212
You should have received a copy of the GNU General Public License
1313
along with this program; if not, write to the Free Software
14-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1515

1616
#ifndef _welcome_copyright_notice_h_
1717
#define _welcome_copyright_notice_h_

‎mysys/hash.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.
1+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
1111
1212
You should have received a copy of the GNU General Public License
1313
along with this program; if not, write to the Free Software
14-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1515

1616
/* The hash functions used for saveing keys */
1717
/* One of key_length or key_length_offset must be given */

‎mysys/my_handler.c‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
/* Copyright (C) 2002-2006 MySQL AB
2-
3-
This library is free software; you can redistribute it and/or
4-
modify it under the terms of the GNU Library General Public
5-
License as published by the Free Software Foundation; version 2
6-
of the License.
7-
8-
This library is distributed in the hope that it will be useful,
1+
/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
2+
3+
This program is free software; you can redistribute it and/or modify
4+
it under the terms of the GNU General Public License as published by
5+
the Free Software Foundation; version 2 of the License.
6+
7+
This program is distributed in the hope that it will be useful,
98
but WITHOUT ANY WARRANTY; without even the implied warranty of
10-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11-
Library General Public License for more details.
9+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
10+
GNU General Public License for more details.
1211
13-
You should have received a copy of the GNU Library General Public
14-
License along with this library; if not, write to the Free
15-
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
16-
MA 02111-1307, USA */
12+
You should have received a copy of the GNU General Public License
13+
along with this program; if not, write to the Free Software
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1715

1816
#include <my_global.h>
1917
#include <m_ctype.h>

‎mysys/my_handler_errors.h‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
#ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED
22
#define MYSYS_MY_HANDLER_ERRORS_INCLUDED
33

4+
/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
5+
6+
This program is free software; you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation; version 2 of the License.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
18+
419
/*
520
Errors a handler can give you
621
*/

‎sql/ha_partition.cc‎

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

1616
/*
1717
This handler was developed by Mikael Ronstrom for version 5.1 of MySQL.

‎sql/ha_partition.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#ifndef HA_PARTITION_INCLUDED
22
#define HA_PARTITION_INCLUDED
33

4-
/* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
4+
/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
55
6-
This program is free software; you can redistribute it and/or modify
7-
it under the terms of the GNU General Public License as published by
8-
the Free Software Foundation; version 2 of the License.
6+
This program is free software; you can redistribute it and/or modify
7+
it under the terms of the GNU General Public License as published by
8+
the Free Software Foundation; version 2 of the License.
99
10-
This program is distributed in the hope that it will be useful,
11-
but WITHOUT ANY WARRANTY; without even the implied warranty of
12-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13-
GNU General Public License for more details.
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
1414
15-
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software Foundation,
17-
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
15+
You should have received a copy of the GNU General Public License
16+
along with this program; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1818

1919
#ifdef __GNUC__
2020
#pragma interface /* gcc class implementation */

‎sql/handler.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License as published by
@@ -10,8 +10,8 @@
1010
GNU General Public License for more details.
1111
1212
You should have received a copy of the GNU General Public License
13-
along with this program; if not, write to the Free Software Foundation,
14-
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
13+
along with this program; if not, write to the Free Software
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1515

1616
/** @file handler.cc
1717

‎sql/handler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
GNU General Public License for more details.
1414
1515
You should have received a copy of the GNU General Public License
16-
along with this program; if not, write to the Free Software Foundation,
17-
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
16+
along with this program; if not, write to the Free Software
17+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1818

1919
/* Definitions for parameters to do with handler-routines */
2020

‎sql/mysqld.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
1212
You should have received a copy of the GNU General Public License
1313
along with this program; if not, write to the Free Software
14-
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
14+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
1515

1616
#include "my_global.h" /* NO_EMBEDDED_ACCESS_CHECKS */
1717
#include "sql_priv.h"
@@ -6847,7 +6847,7 @@ static void usage(void)
68476847
if (!default_collation_name)
68486848
default_collation_name= (char*) default_charset_info->name;
68496849
print_version();
6850-
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2010"));
6850+
puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000, 2011"));
68516851
puts("Starts the MySQL database server.\n");
68526852
printf("Usage: %s [OPTIONS]\n", my_progname);
68536853
if (!opt_verbose)

0 commit comments

Comments
 (0)