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

Proposed by Tomislav Plavcic on 2014-04-17
Status: Merged
Approved by: Laurynas Biveinis on 2014-04-17
Approved revision: 626
Merged at revision: 650
Proposed branch: lp:~tplavcic/percona-server/bld-108-5.5
Merge into: lp:percona-server/5.5
Diff against target: 126 lines (+65/-2) (has conflicts)
3 files modified
build-ps/debian/changelog (+35/-0)
scripts/mysql_install_db.pl.in (+20/-2)
scripts/mysql_install_db.sh (+10/-0)
Text conflict in scripts/mysql_install_db.pl.in
Text conflict in scripts/mysql_install_db.sh
To merge this branch: bzr merge lp:~tplavcic/percona-server/bld-108-5.5
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) 2014-04-17 Approve on 2014-04-17
Review via email: mp+216269@code.launchpad.net

Description of the change

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/

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build-ps/debian/changelog'
2--- build-ps/debian/changelog 2013-10-09 22:16:27 +0000
3+++ build-ps/debian/changelog 2014-04-17 09:05:56 +0000
4@@ -1,3 +1,38 @@
5+percona-server-5.5 (5.5.36-rel34.2) unstable; urgency=low
6+
7+ * Release 5.5.36-34.2
8+ * Added UDF and HandlerSocket
9+ * Reverted change of location from /usr/share/percona-server to /usr/share/mysql
10+
11+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 25 Mar 2014 11:04:59 +0100
12+
13+percona-server-5.5 (5.5.36-rel34.1) unstable; urgency=low
14+
15+ * Release 5.5.36-34.1
16+
17+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 17 Mar 2014 10:57:09 +0100
18+
19+percona-server-5.5 (5.5.36-rel34.0) unstable; urgency=low
20+
21+ * Release 5.5.36-34.0
22+ * Resolved: Multiple arch installation of libmysqlclient18 broken
23+
24+ -- Alexey Bychko <alexey.bychko@percona.com> Tue, 10 Mar 2014 10:44:46 +0100
25+
26+percona-server-5.5 (5.5.35-rel33.0) unstable; urgency=low
27+
28+ * Release 5.5.35-33.0
29+
30+ -- Ignacio Nin <ignacio.nin@percona.com> Fri, 20 Dec 2013 10:40:29 +0100
31+
32+percona-server-5.5 (5.5.34-rel32.0) unstable; urgency=low
33+
34+ * Release 5.5.34-32.0
35+ * Resolved: apt-upgrading percona-server fails in post-installation
36+ * Resolved: libmysqlclient18-dev doesn't provide libmysqlclient-dev
37+
38+ -- Ignacio Nin <ignacio.nin@percona.com> Mon, 28 Oct 2013 10:31:09 +0100
39+
40 percona-server-5.5 (5.5.33-rel31.1) unstable; urgency=low
41
42 * Remove the info entry for mysql.info, which was pointless.
43
44=== modified file 'scripts/mysql_install_db.pl.in'
45--- scripts/mysql_install_db.pl.in 2014-03-27 15:42:21 +0000
46+++ scripts/mysql_install_db.pl.in 2014-04-17 09:05:56 +0000
47@@ -537,6 +537,7 @@
48 " cd mysql-test ; perl mysql-test-run.pl");
49 }
50 report($opt,
51+<<<<<<< TREE
52 "Please report any problems at http://bugs.mysql.com/",
53 "",
54 "The latest information about MySQL is available on the web at",
55@@ -544,6 +545,16 @@
56 " http://www.mysql.com",
57 "",
58 "Support MySQL by buying support/licenses at http://shop.mysql.com");
59+=======
60+ "Please report any problems @",
61+ " https://bugs.launchpad.net/percona-server/+filebug",
62+ "",
63+ "The latest information about Percona Server is available on the web @",
64+ " http://www.percona.com/software/percona-server",
65+ "",
66+ "Support Percona by buying support @",
67+ " http://www.percona.com/products/mysql-support");
68+>>>>>>> MERGE-SOURCE
69 }
70 exit 0
71 }
72@@ -565,14 +576,21 @@
73 "Try 'mysqld --help' if you have problems with paths. Using --log",
74 "gives you a log in $opt->{ldata} that may be helpful.",
75 "",
76- "The latest information about MySQL is available on the web at",
77- "http://www.mysql.com",
78+ "The latest information about Percona Server is available on the web @",
79+ " http://www.percona.com/software/percona-server",
80+ "",
81 "Please consult the MySQL manual section: 'Problems running mysql_install_db',",
82 "and the manual section that describes problems on your OS.",
83 "Another information source is the MySQL email archive.",
84+<<<<<<< TREE
85 "",
86 "Please check all of the above before submitting a bug report",
87 "at http://bugs.mysql.com/")
88+=======
89+ "",
90+ "Please check all of the above before submitting a bug report @",
91+ " https://bugs.launchpad.net/percona-server/+filebug")
92+>>>>>>> MERGE-SOURCE
93 }
94
95 ##############################################################################
96
97=== modified file 'scripts/mysql_install_db.sh'
98--- scripts/mysql_install_db.sh 2014-03-13 13:12:13 +0000
99+++ scripts/mysql_install_db.sh 2014-04-17 09:05:56 +0000
100@@ -426,8 +426,13 @@
101 echo "describes problems on your OS. Another information source are the"
102 echo "MySQL email archives available at http://lists.mysql.com/."
103 echo
104+<<<<<<< TREE
105 echo "Please check all of the above before submitting a bug report"
106 echo "at http://bugs.mysql.com/"
107+=======
108+ echo "Please check all of the above before submitting a bug report @"
109+ echo " https://bugs.launchpad.net/percona-server/+filebug"
110+>>>>>>> MERGE-SOURCE
111 echo
112 exit 1
113 fi
114@@ -478,7 +483,12 @@
115 fi
116
117 echo
118+<<<<<<< TREE
119 echo "Please report any problems at http://bugs.mysql.com/"
120+=======
121+ echo "Please report any problems @"
122+ echo " https://bugs.launchpad.net/percona-server/+filebug"
123+>>>>>>> MERGE-SOURCE
124 echo
125 echo "Percona recommends that all production deployments be protected with a support"
126 echo "contract (http://www.percona.com/mysql-suppport/) to ensure the highest uptime,"

Subscribers

People subscribed via source and target branches