Skip to content

Commit 13ec2a1

Browse files
author
Alexander Nozdrin
committed
Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).
Fixing copyright text.
1 parent 93594df commit 13ec2a1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+112
-125
lines changed

‎CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006-2008 MySQL AB, 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
1717
# Avoid warnings in higher versions

‎client/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(
1717
${CMAKE_SOURCE_DIR}/include

‎cmd-line-utils/libedit/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} )
1717
INCLUDE(CheckIncludeFile)

‎cmd-line-utils/readline/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2007 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
1717
${CMAKE_SOURCE_DIR}/cmd-line-utils)

‎dbug/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(
1717
${CMAKE_SOURCE_DIR}/dbug

‎extra/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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,8 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15-
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1615

1716
INCLUDE_DIRECTORIES(
1817
${CMAKE_SOURCE_DIR}/include

‎extra/yassl/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(
1717
${CMAKE_SOURCE_DIR}/include

‎extra/yassl/taocrypt/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL
1717
${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include)

‎include/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
SET(HEADERS_GEN_CONFIGURE
1717
${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h

‎libmysql/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(
1717
${CMAKE_SOURCE_DIR}/include

‎libmysqld/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
ADD_DEFINITIONS(-DMYSQL_SERVER -DEMBEDDED_LIBRARY
1717
${SSL_DEFINES})

‎libmysqld/examples/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
1717
${CMAKE_SOURCE_DIR}/libmysqld/include

‎libservices/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
1717

‎man/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
# Copy man pages
1717
FILE(GLOB MAN1_FILES *.1)

‎mysql-test/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
INSTALL(
1717
DIRECTORY .

‎mysql-test/lib/My/SafeProcess/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
SET(INSTALL_ARGS
1717
DESTINATION "${INSTALL_MYSQLTESTDIR}/lib/My/SafeProcess"

‎mysys/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB, 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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,9 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15-
16-
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1715

1816
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys)
1917

‎plugin/audit_null/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2010 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
MYSQL_ADD_PLUGIN(audit_null audit_null.c
1717
MODULE_ONLY MODULE_OUTPUT_NAME "adt_null")

‎plugin/audit_null/audit_null.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ mysql_declare_plugin(audit_null)
144144
MYSQL_AUDIT_PLUGIN, /* type */
145145
&audit_null_descriptor, /* descriptor */
146146
"NULL_AUDIT", /* name */
147-
"MySQL AB", /* author */
147+
"Oracle Corp", /* author */
148148
"Simple NULL Audit", /* description */
149149
PLUGIN_LICENSE_GPL,
150150
audit_null_plugin_init, /* init function (when loaded) */

‎plugin/daemon_example/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
MYSQL_ADD_PLUGIN(daemon_example daemon_example.cc
1717
MODULE_ONLY MODULE_OUTPUT_NAME "libdaemon_example")

‎plugin/fulltext/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Copyright (C) 2009 Sun Microsystems, Inc
1+
# Copyright (c) 2006, 2010, 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
55
# the Free Software Foundation; version 2 of the License.
6-
#
6+
#
77
# This program is distributed in the hope that it will be useful,
88
# but WITHOUT ANY WARRANTY; without even the implied warranty of
99
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1010
# GNU General Public License for more details.
11-
#
11+
#
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

1616
MYSQL_ADD_PLUGIN(ftexample plugin_example.c
1717
MODULE_ONLY MODULE_OUTPUT_NAME "mypluglib")

‎plugin/semisync/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2009 Sun Microsystems,Inc
1+
# Copyright (c) 2006, 2010, 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,9 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15-
16-
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1715

1816
SET(SEMISYNC_MASTER_SOURCES
1917
semisync.cc semisync_master.cc semisync_master_plugin.cc

‎regex/CMakeLists.txt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2006 MySQL AB
1+
# Copyright (c) 2006, 2010, 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,8 +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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
15-
14+
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1615

1716
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
1817

0 commit comments

Comments
 (0)