Merge lp:~stewart/percona-server/5.6-copyright into lp:percona-server/5.6

Proposed by Stewart Smith
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 382
Merged at revision: 383
Proposed branch: lp:~stewart/percona-server/5.6-copyright
Merge into: lp:percona-server/5.6
Diff against target: 91 lines (+32/-7)
5 files modified
Percona-Server/client/mysql.cc (+6/-7)
Percona-Server/include/welcome_copyright_notice.h (+2/-0)
Percona-Server/mysql-test/r/mysql_config_editor.result (+1/-0)
doc/source/copyright.rst (+22/-0)
doc/source/index.rst (+1/-0)
To merge this branch: bzr merge lp:~stewart/percona-server/5.6-copyright
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Alexey Kopytov Pending
Review via email: mp+168888@code.launchpad.net

This proposal supersedes a proposal from 2013-06-12.

Description of the change

Update the user visible copyright notices in Percona Server.

Fixed: not mentioning SHOW PATCHES in 5.5/5.6

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Stewart Smith (stewart) wrote : Posted in a previous version of this proposal

Fixed missing \ in welcome header file that led to build failures.

Updated jenkins run:
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/138/

Revision history for this message
Stewart Smith (stewart) wrote : Posted in a previous version of this proposal
Revision history for this message
Alexey Kopytov (akopytov) wrote : Posted in a previous version of this proposal

As there's no SHOW PATCHES in PS 5.5/5.6, we probably don't want to mention it in docs?

review: Needs Fixing
Revision history for this message
Alexey Kopytov (akopytov) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) wrote : Posted in a previous version of this proposal

Jenkins

Revision history for this message
Stewart Smith (stewart) wrote : Posted in a previous version of this proposal
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/client/mysql.cc'
2--- Percona-Server/client/mysql.cc 2013-05-27 03:01:29 +0000
3+++ Percona-Server/client/mysql.cc 2013-06-12 09:48:49 +0000
4@@ -3293,13 +3293,12 @@
5 return com_server_help(buffer,line,help_arg);
6 }
7
8- put_info("\nFor information about MySQL products and services, visit:\n"
9- " http://www.mysql.com/\n"
10- "For developer information, including the MySQL Reference Manual, "
11- "visit:\n"
12- " http://dev.mysql.com/\n"
13- "To buy MySQL Enterprise support, training, or other products, visit:\n"
14- " https://shop.mysql.com/\n", INFO_INFO);
15+ put_info("\nFor information about Percona products and services, visit:\n"
16+ " http://www.percona.com/\n"
17+ "Percona Server manual: http://www.percona.com/doc/percona-server/5.1\n"
18+ "For the MySQL Reference Manual: http://dev.mysql.com/\n"
19+ "To buy Percona support, training, or other products, visit:\n"
20+ " https://www.percona.com/\n", INFO_INFO);
21 put_info("List of all MySQL commands:", INFO_INFO);
22 if (!named_cmds)
23 put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);
24
25=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
26--- Percona-Server/include/welcome_copyright_notice.h 2013-02-26 05:45:28 +0000
27+++ Percona-Server/include/welcome_copyright_notice.h 2013-06-12 09:48:49 +0000
28@@ -24,10 +24,12 @@
29 */
30 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
31 (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
32+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
33 "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
34 "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
35 "registered trademark of Oracle Corporation and/or its\naffiliates. " \
36 "Other names may be trademarks of their respective\nowners.\n" : \
37+ "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
38 "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
39 "All rights reserved.\n\nOracle is a registered trademark of " \
40 "Oracle Corporation and/or its\naffiliates. Other names may be " \
41
42=== modified file 'Percona-Server/mysql-test/r/mysql_config_editor.result'
43--- Percona-Server/mysql-test/r/mysql_config_editor.result 2013-02-05 11:23:16 +0000
44+++ Percona-Server/mysql-test/r/mysql_config_editor.result 2013-06-12 09:48:49 +0000
45@@ -100,6 +100,7 @@
46 ##############################################
47 # Tests for mysql_config_editor's help command
48 ##############################################
49+Copyright (c) 2009-2013 Percona Ireland Ltd.
50 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
51
52 Oracle is a registered trademark of Oracle Corporation and/or its
53
54=== added file 'doc/source/copyright.rst'
55--- doc/source/copyright.rst 1970-01-01 00:00:00 +0000
56+++ doc/source/copyright.rst 2013-06-12 09:48:49 +0000
57@@ -0,0 +1,22 @@
58+===================================
59+Copyright and Licensing Information
60+===================================
61+
62+
63+Documentation Licensing
64+=======================
65+
66+This 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.
67+
68+Software License
69+================
70+
71+Percona Server is built upon MySQL from Oracle. Along with making our own
72+modifications, we merge in changes from other sources such as community
73+contributions and changes from MariaDB.
74+
75+The original SHOW USER/TABLE/INDEX statistics code came from Google.
76+
77+Percona does not require copyright assignment.
78+
79+See the COPYING files accompanying the software distribution.
80
81=== modified file 'doc/source/index.rst'
82--- doc/source/index.rst 2013-06-03 17:44:39 +0000
83+++ doc/source/index.rst 2013-06-12 09:48:49 +0000
84@@ -145,6 +145,7 @@
85 trademark-policy
86 index_info_schema_tables
87 faq
88+ copyright
89 compatibility
90 release-notes/release-notes_index
91 glossary

Subscribers

People subscribed via source and target branches