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

[Stewart Smith]

Update the user visible copyright notices in Percona Server.

Fixed: not mentioning SHOW PATCHES in 5.5/5.6

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

[Stewart Smith (stewart)]

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/

[Stewart Smith (stewart)]

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

[Alexey Kopytov (akopytov)]

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

[Alexey Kopytov (akopytov)]

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

Jenkins

[Stewart Smith (stewart)]

Fixed test result to include Percona (C) line:

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

=== modified file 'Percona-Server/client/mysql.cc'
--- Percona-Server/client/mysql.cc	2013-05-27 03:01:29 +0000
+++ Percona-Server/client/mysql.cc	2013-06-12 07:31:31 +0000
@@ -3293,13 +3293,12 @@
 	  return com_server_help(buffer,line,help_arg);
   }
 
-  put_info("\nFor information about MySQL products and services, visit:\n"
-           "   http://www.mysql.com/\n"
-           "For developer information, including the MySQL Reference Manual, "
-           "visit:\n"
-           "   http://dev.mysql.com/\n"
-           "To buy MySQL Enterprise support, training, or other products, visit:\n"
-           "   https://shop.mysql.com/\n", INFO_INFO);
+  put_info("\nFor information about Percona products and services, visit:\n"
+           "   http://www.percona.com/\n"
+	   "Percona Server manual: http://www.percona.com/doc/percona-server/5.1\n"
+           "For the MySQL Reference Manual: http://dev.mysql.com/\n"
+           "To buy Percona support, training, or other products, visit:\n"
+           "   https://www.percona.com/\n", INFO_INFO);
   put_info("List of all MySQL commands:", INFO_INFO);
   if (!named_cmds)
     put_info("Note that all text commands must be first on line and end with ';'",INFO_INFO);

=== modified file 'Percona-Server/include/welcome_copyright_notice.h'
--- Percona-Server/include/welcome_copyright_notice.h	2013-02-26 05:45:28 +0000
+++ Percona-Server/include/welcome_copyright_notice.h	2013-06-12 07:31:31 +0000
@@ -24,10 +24,12 @@
 */
 #define ORACLE_WELCOME_COPYRIGHT_NOTICE(first_year) \
   (strcmp(first_year, COPYRIGHT_NOTICE_CURRENT_YEAR) ? \
+   "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
    "Copyright (c) " first_year ", " COPYRIGHT_NOTICE_CURRENT_YEAR ", " \
    "Oracle and/or its affiliates. All rights reserved.\n\nOracle is a " \
    "registered trademark of Oracle Corporation and/or its\naffiliates. " \
    "Other names may be trademarks of their respective\nowners.\n" : \
+   "Copyright (c) 2009-" COPYRIGHT_NOTICE_CURRENT_YEAR " Percona Ireland Ltd.\n" \
    "Copyright (c) " first_year ", Oracle and/or its affiliates. " \
    "All rights reserved.\n\nOracle is a registered trademark of " \
    "Oracle Corporation and/or its\naffiliates. Other names may be " \

=== modified file 'Percona-Server/mysql-test/r/mysql_config_editor.result'
--- Percona-Server/mysql-test/r/mysql_config_editor.result	2013-02-05 11:23:16 +0000
+++ Percona-Server/mysql-test/r/mysql_config_editor.result	2013-06-12 07:31:31 +0000
@@ -100,6 +100,7 @@
 ##############################################
 # Tests for mysql_config_editor's help command
 ##############################################
+Copyright (c) 2009-2013 Percona Ireland Ltd.
 Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
 
 Oracle is a registered trademark of Oracle Corporation and/or its

=== added file 'doc/source/copyright.rst'
--- doc/source/copyright.rst	1970-01-01 00:00:00 +0000
+++ doc/source/copyright.rst	2013-06-12 07:31:31 +0000
@@ -0,0 +1,22 @@
+===================================
+Copyright and Licensing Information
+===================================
+
+
+Documentation Licensing
+=======================
+
+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.
+
+Software License
+================
+
+Percona Server is built upon MySQL from Oracle. Along with making our own
+modifications, we merge in changes from other sources such as community
+contributions and changes from MariaDB.
+
+The original SHOW USER/TABLE/INDEX statistics code came from Google.
+
+Percona does not require copyright assignment.
+
+See the COPYING files accompanying the software distribution.

=== modified file 'doc/source/index.rst'
--- doc/source/index.rst	2013-06-03 17:44:39 +0000
+++ doc/source/index.rst	2013-06-12 07:31:31 +0000
@@ -145,6 +145,7 @@
    trademark-policy
    index_info_schema_tables
    faq
+   copyright
    compatibility
    release-notes/release-notes_index
    glossary