Merge lp:~tplavcic/percona-server/bld-108-5.5 into lp:percona-server/5.5

[Tomislav Plavcic]

Links to mysql.com during installation changed to Percona links
Updated debian changelog

Tested installation of 5.6 version and the changed text comes up as:
"
Please report any problems @
  https://bugs.launchpad.net/percona-server/+filebug

The latest information about Percona Server is available on the web @
  http://www.percona.com/software/percona-server

Support Percona by buying support @
  http://www.percona.com/products/mysql-support
"
Packages available here:
http://jenkins.percona.com/view/Percona-RELEASES/job/percona-server-5.6-RELEASE/59/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'build-ps/debian/changelog'
--- build-ps/debian/changelog	2013-10-09 22:16:27 +0000
+++ build-ps/debian/changelog	2014-04-17 09:05:56 +0000
@@ -1,3 +1,38 @@
+percona-server-5.5 (5.5.36-rel34.2) unstable; urgency=low
+
+  * Release 5.5.36-34.2
+  * Added UDF and HandlerSocket
+  * Reverted change of location from /usr/share/percona-server to /usr/share/mysql
+
+ -- Alexey Bychko <[e-mail]>  Tue, 25 Mar 2014 11:04:59 +0100
+
+percona-server-5.5 (5.5.36-rel34.1) unstable; urgency=low
+
+  * Release 5.5.36-34.1
+
+ -- Alexey Bychko <[e-mail]>  Tue, 17 Mar 2014 10:57:09 +0100
+
+percona-server-5.5 (5.5.36-rel34.0) unstable; urgency=low
+
+  * Release 5.5.36-34.0
+  * Resolved: Multiple arch installation of libmysqlclient18 broken
+
+ -- Alexey Bychko <[e-mail]>  Tue, 10 Mar 2014 10:44:46 +0100
+
+percona-server-5.5 (5.5.35-rel33.0) unstable; urgency=low
+
+  * Release 5.5.35-33.0
+
+ -- Ignacio Nin <[e-mail]>  Fri, 20 Dec 2013 10:40:29 +0100
+
+percona-server-5.5 (5.5.34-rel32.0) unstable; urgency=low
+
+  * Release 5.5.34-32.0
+  * Resolved: apt-upgrading percona-server fails in post-installation
+  * Resolved: libmysqlclient18-dev doesn't provide libmysqlclient-dev
+
+ -- Ignacio Nin <[e-mail]>  Mon, 28 Oct 2013 10:31:09 +0100
+
 percona-server-5.5 (5.5.33-rel31.1) unstable; urgency=low
 
   * Remove the info entry for mysql.info, which was pointless.
 
=== modified file 'scripts/mysql_install_db.pl.in'
--- scripts/mysql_install_db.pl.in	2014-03-27 15:42:21 +0000
+++ scripts/mysql_install_db.pl.in	2014-04-17 09:05:56 +0000
@@ -537,6 +537,7 @@
              "  cd mysql-test ; perl mysql-test-run.pl");
     }
     report($opt,
+<<<<<<< TREE
            "Please report any problems at http://bugs.mysql.com/",
            "",
            "The latest information about MySQL is available on the web at",
@@ -544,6 +545,16 @@
            "  http://www.mysql.com",
            "",
            "Support MySQL by buying support/licenses at http://shop.mysql.com");
+=======
+           "Please report any problems @",
+           "  https://bugs.launchpad.net/percona-server/+filebug",
+           "",
+           "The latest information about Percona Server is available on the web @",
+           "  http://www.percona.com/software/percona-server",
+           "",
+           "Support Percona by buying support @",
+           "  http://www.percona.com/products/mysql-support");
+>>>>>>> MERGE-SOURCE
   }
   exit 0
 }
@@ -565,14 +576,21 @@
         "Try 'mysqld --help' if you have problems with paths. Using --log",
         "gives you a log in $opt->{ldata} that may be helpful.",
         "",
-        "The latest information about MySQL is available on the web at",
-        "http://www.mysql.com",
+        "The latest information about Percona Server is available on the web @",
+        "  http://www.percona.com/software/percona-server",
+	"",
         "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
         "and the manual section that describes problems on your OS.",
         "Another information source is the MySQL email archive.",
+<<<<<<< TREE
         "",
         "Please check all of the above before submitting a bug report",
         "at http://bugs.mysql.com/")
+=======
+        "",
+        "Please check all of the above before submitting a bug report @",
+        "  https://bugs.launchpad.net/percona-server/+filebug")
+>>>>>>> MERGE-SOURCE
 }
 
 ##############################################################################
 
=== modified file 'scripts/mysql_install_db.sh'
--- scripts/mysql_install_db.sh	2014-03-13 13:12:13 +0000
+++ scripts/mysql_install_db.sh	2014-04-17 09:05:56 +0000
@@ -426,8 +426,13 @@
   echo "describes problems on your OS.  Another information source are the"
   echo "MySQL email archives available at http://lists.mysql.com/."
   echo
+<<<<<<< TREE
   echo "Please check all of the above before submitting a bug report"
   echo "at http://bugs.mysql.com/"
+=======
+  echo "Please check all of the above before submitting a bug report @"
+  echo "  https://bugs.launchpad.net/percona-server/+filebug"
+>>>>>>> MERGE-SOURCE
   echo
   exit 1
 fi
@@ -478,7 +483,12 @@
   fi
 
   echo
+<<<<<<< TREE
   echo "Please report any problems at http://bugs.mysql.com/"
+=======
+  echo "Please report any problems @"
+  echo "  https://bugs.launchpad.net/percona-server/+filebug"
+>>>>>>> MERGE-SOURCE
   echo
   echo "Percona recommends that all production deployments be protected with a support"
   echo "contract (http://www.percona.com/mysql-suppport/) to ensure the highest uptime,"