Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.6 into lp:percona-server/5.6

  1. c-change-2013-5.6
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Hrvoje Matijakovic
Approved revision: no longer in the source branch.
Merged at revision: 412
Proposed branch: lp:~laurynas-biveinis/percona-server/c-change-2013-5.6
Merge into: lp:percona-server/5.6
Diff against target: 189 lines (+19/-17)
14 files modified
Percona-Server/include/welcome_copyright_notice.h (+4/-2)
Percona-Server/mysql-test/r/mysql_config_editor.result (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/configure.ac (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/groups.c (+1/-1)
Percona-Server/plugin/percona-pam-for-mysql/src/groups.h (+1/-1)
doc/source/conf.py (+3/-3)
doc/source/copyright.rst (+1/-1)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/c-change-2013-5.6
Reviewer Review Type Date Requested Status
Vadim Tkachenko Approve
Hrvoje Matijakovic Approve
Review via email: mp+181348@code.launchpad.net

Description of the change

http://jenkins.percona.com/job/percona-server-5.6-param/227/

Merge from 5.5 copyright notice update that replaces
"Copyright (c) 2009-2013 Percona Ireland Ltd."
with
"Copyright (c) 2009-2013 Percona LLC and/or its affiliates".

To post a comment you must log in.
Revision history for this message
Hrvoje Matijakovic (hrvojem) :
review: Approve
Revision history for this message
Vadim Tkachenko (vadim-tk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
--- Percona-Server/include/welcome_copyright_notice.h 2013-08-14 03:57:21 +0000
+++ Percona-Server/include/welcome_copyright_notice.h 2013-08-21 16:17:01 +0000
@@ -24,12 +24,14 @@
24*/24*/
25#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \25#define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
26 (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \26 (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
27 "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \27 "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
28 " Percona LLC and/or its affiliates\n" \
28 "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \29 "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
29 "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \30 "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
30 "registered trademark of Oracle Corporation and/or its\naffiliates. " \31 "registered trademark of Oracle Corporation and/or its\naffiliates. " \
31 "Other names may be trademarks of their respective\nowners.\n" : \32 "Other names may be trademarks of their respective\nowners.\n" : \
32 "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \33 "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR \
34 " Percona LLC and/or its affiliates\n" \
33 "Copyright (c) " first_year ", Oracle and/or its affiliates. " \35 "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
34 "All rights reserved.\n\nOracle is a registered trademark of " \36 "All rights reserved.\n\nOracle is a registered trademark of " \
35 "Oracle Corporation and/or its\naffiliates. Other names may be " \37 "Oracle Corporation and/or its\naffiliates. Other names may be " \
3638
=== modified file 'Percona-Server/mysql-test/r/mysql_config_editor.result'
--- Percona-Server/mysql-test/r/mysql_config_editor.result 2013-06-12 07:29:33 +0000
+++ Percona-Server/mysql-test/r/mysql_config_editor.result 2013-08-21 16:17:01 +0000
@@ -100,7 +100,7 @@
100##############################################100##############################################
101# Tests for mysql_config_editor's help command101# Tests for mysql_config_editor's help command
102##############################################102##############################################
103Copyright (c) 2009-2013 Percona Ireland Ltd.103Copyright (c) 2009-2013 Percona LLC and/or its affiliates
104Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.104Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
105105
106Oracle is a registered trademark of Oracle Corporation and/or its106Oracle is a registered trademark of Oracle Corporation and/or its
107107
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt'
--- Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-06-14 07:38:47 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/CMakeLists.txt 2013-08-21 16:17:01 +0000
@@ -1,4 +1,4 @@
1# (C) 2011-2013 Percona Ireland Ltd.1# (C) 2011-2013 Percona LLC and/or its affiliates
2#2#
3# This program is free software; you can redistribute it and/or modify3# 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 by4# it under the terms of the GNU General Public License as published by
55
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/configure.ac'
--- Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/configure.ac 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1# -*- Autoconf -*-1# -*- Autoconf -*-
2# (C) 2011-2013 Percona Ireland Ltd.2# (C) 2011-2013 Percona Percona LLC and/or its affiliates
3#3#
4# This program is free software; you can redistribute it and/or modify4# 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 by5# it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am'
--- Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/Makefile.am 2013-08-21 16:17:01 +0000
@@ -1,4 +1,4 @@
1# (C) 2011-2013 Percona Ireland Ltd.1# (C) 2011-2013 Percona LLC and/or its affiliates
2#2#
3# This program is free software; you can redistribute it and/or modify3# 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 by4# it under the terms of the GNU General Public License as published by
55
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c'
--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-06-14 06:50:45 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.c 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1/*1/*
2(C) 2012, 2013 Percona Ireland Ltd.2(C) 2012, 2013 Percona LLC and/or its affiliates
33
4This program is free software; you can redistribute it and/or modify4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by5it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h'
--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-06-14 06:50:45 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_mapping.h 2013-08-21 16:17:01 +0000
@@ -1,7 +1,7 @@
1#ifndef AUTH_MAPPING_INCLUDED1#ifndef AUTH_MAPPING_INCLUDED
2#define AUTH_MAPPING_INCLUDED2#define AUTH_MAPPING_INCLUDED
3/*3/*
4 (C) 2012, 2013 Percona Ireland Ltd.4 (C) 2012, 2013 Percona LLC and/or its affiliates
55
6 This program is free software; you can redistribute it and/or modify6 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 by7 it under the terms of the GNU General Public License as published by
88
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c'
--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam.c 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1/*1/*
2(C) 2012, 2013 Percona Ireland Ltd.2(C) 2012, 2013 Percona LLC and/or its affiliates
33
4This program is free software; you can redistribute it and/or modify4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by5it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c'
--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_common.c 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1/*1/*
2(C) 2011-2013 Percona Ireland Ltd.2(C) 2011-2013 Percona LLC and/or its affiliates
33
4This program is free software; you can redistribute it and/or modify4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by5it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c'
--- Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/auth_pam_compat.c 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1/*1/*
2(C) 2012, 2013 Percona Ireland Ltd.2(C) 2012, 2013 Percona Percona LLC and/or its affiliates
33
4This program is free software; you can redistribute it and/or modify4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by5it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.c'
--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.c 2013-08-21 16:17:01 +0000
@@ -1,5 +1,5 @@
1/*1/*
2(C) 2013 Percona Ireland Ltd.2(C) 2013 Percona LLC and/or its affiliates
33
4This program is free software; you can redistribute it and/or modify4This program is free software; you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by5it under the terms of the GNU General Public License as published by
66
=== modified file 'Percona-Server/plugin/percona-pam-for-mysql/src/groups.h'
--- Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-06-06 13:53:07 +0000
+++ Percona-Server/plugin/percona-pam-for-mysql/src/groups.h 2013-08-21 16:17:01 +0000
@@ -1,7 +1,7 @@
1#ifndef AUTH_PAM_GROUPS_INCLUDED1#ifndef AUTH_PAM_GROUPS_INCLUDED
2#define AUTH_PAM_GROUPS_INCLUDED2#define AUTH_PAM_GROUPS_INCLUDED
3/*3/*
4 (C) 2013 Percona Ireland Ltd.4 (C) 2013 Percona LLC and/or its affiliates
55
6 This program is free software; you can redistribute it and/or modify6 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 by7 it under the terms of the GNU General Public License as published by
88
=== modified file 'doc/source/conf.py'
--- doc/source/conf.py 2013-08-14 03:57:21 +0000
+++ doc/source/conf.py 2013-08-21 16:17:01 +0000
@@ -45,7 +45,7 @@
4545
46# General information about the project.46# General information about the project.
47project = u'Percona Server'47project = u'Percona Server'
48copyright = u'Percona Ireland Ltd. 2009-2013'48copyright = u'Percona LLC and/or its affiliates 2009-2013'
4949
50# The version info for the project you're documenting, acts as replacement for50# The version info for the project you're documenting, acts as replacement for
51# |version| and |release|, also used in various other places throughout the51# |version| and |release|, also used in various other places throughout the
@@ -226,7 +226,7 @@
226# (source start file, target name, title, author, documentclass [howto/manual]).226# (source start file, target name, title, author, documentclass [howto/manual]).
227latex_documents = [227latex_documents = [
228 ('index', 'PerconaServer-5.6.tex', u'Percona Server Documentation',228 ('index', 'PerconaServer-5.6.tex', u'Percona Server Documentation',
229 u'Percona Ireland Ltd. 2009-2013', 'manual'),229 u'Percona LLC and/or its affiliates 2009-2013', 'manual'),
230]230]
231231
232# The name of an image file (relative to this directory) to place at the top of232# The name of an image file (relative to this directory) to place at the top of
@@ -259,7 +259,7 @@
259# (source start file, name, description, authors, manual section).259# (source start file, name, description, authors, manual section).
260man_pages = [260man_pages = [
261 ('index', 'perconaserver56', u'Percona Server 5.6 Documentation',261 ('index', 'perconaserver56', u'Percona Server 5.6 Documentation',
262 [u'Percona Ireland Ltd. 2009-2013'], 1)262 [u'Percona LLC and/or its affiliates 2009-2013'], 1)
263]263]
264264
265265
266266
=== modified file 'doc/source/copyright.rst'
--- doc/source/copyright.rst 2013-06-12 05:29:59 +0000
+++ doc/source/copyright.rst 2013-08-21 16:17:01 +0000
@@ -6,7 +6,7 @@
6Documentation Licensing6Documentation Licensing
7=======================7=======================
88
9This software documentation is (C)2009-2013 Percona Ireland Ltd. and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.9This software documentation is (C)2009-2013 Percona LLC and/or its affiliates and is distributed under the `Creative Commons Attribution-ShareAlike 2.0 Generic <http://creativecommons.org/licenses/by-sa/2.0/>`_ license.
1010
11Software License11Software License
12================12================

Subscribers

People subscribed via source and target branches