Merge lp:~percona-core/percona-server/release-5.6.10-60.2 into lp:percona-server/5.6

Proposed by Ignacio Nin
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 326
Merged at revision: 335
Proposed branch: lp:~percona-core/percona-server/release-5.6.10-60.2
Merge into: lp:percona-server/5.6
Diff against target: 189 lines (+18/-43)
9 files modified
Makefile (+1/-1)
build/debian/control (+1/-1)
build/debian/docs (+0/-2)
build/debian/libmysqlclient18.docs (+2/-0)
build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch (+7/-12)
build/debian/percona-server-server-5.6.install (+0/-1)
build/debian/percona-server-server-5.6.postinst (+4/-22)
build/debian/rules (+1/-1)
build/percona-server.spec (+2/-3)
To merge this branch: bzr merge lp:~percona-core/percona-server/release-5.6.10-60.2
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+157484@code.launchpad.net

Description of the change

Changes for release-5.6.10-60.2

To post a comment you must log in.
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 'Makefile'
2--- Makefile 2012-12-04 08:24:59 +0000
3+++ Makefile 2013-04-05 21:08:23 +0000
4@@ -1,4 +1,4 @@
5-MYSQL_VERSION=5.6.8
6+MYSQL_VERSION=5.6.10
7 PERCONA_SERVER_VERSION=alpha60.2
8 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
9 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
10
11=== modified file 'build/debian/control'
12--- build/debian/control 2012-08-10 20:27:09 +0000
13+++ build/debian/control 2013-04-05 21:08:23 +0000
14@@ -76,7 +76,7 @@
15
16 Package: percona-server-client-5.6
17 Architecture: any
18-Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libmysqlclient18 (>= ${source:Version}), ${shlib:Depends}, ${misc:Depends}
19+Depends: debianutils (>=1.6), libdbi-perl, percona-server-common-5.6 (>= ${source:Version}), libmysqlclient18, ${shlib:Depends}, ${misc:Depends}
20 Provides: mysql-client, virtual-mysql-client
21 Conflicts: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
22 Replaces: mysql-client (<< ${source:Version}), mysql-client-5.0, mysql-client-5.1, mysql-client-core-5.1, percona-xtradb-client-5.0, percona-server-client-5.1, percona-server-client-5.5
23
24=== removed file 'build/debian/docs'
25--- build/debian/docs 2013-03-05 12:46:43 +0000
26+++ build/debian/docs 1970-01-01 00:00:00 +0000
27@@ -1,2 +0,0 @@
28-CMakeLists.txt
29-README
30
31=== modified file 'build/debian/libmysqlclient18.docs'
32--- build/debian/libmysqlclient18.docs 2013-03-05 12:46:43 +0000
33+++ build/debian/libmysqlclient18.docs 2013-04-05 21:08:23 +0000
34@@ -0,0 +1,2 @@
35+CMakeLists.txt
36+README
37
38=== renamed file 'build/debian/info' => 'build/debian/libmysqlclient18.info'
39=== modified file 'build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch'
40--- build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch 2013-03-05 12:46:43 +0000
41+++ build/debian/patches/30_scripts__mysqld_safe.sh__signals.dpatch 2013-04-05 21:08:23 +0000
42@@ -4,14 +4,9 @@
43 ## DP: 30_scripts__mysqld_safe.sh__signals.patch by <ch@debian.org>
44
45 @DPATCH@
46-
47-30_scripts__mysqld_safe.sh__signals.patch by <ch@debian.org>
48-
49-Executes /etc/init.d/mysql on signals
50-Reported as http://bugs.mysql.com/bug.php?id=31361
51-
52---- a/scripts/mysqld_safe.sh
53-+++ b/scripts/mysqld_safe.sh
54+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' Percona-Server~/scripts/mysqld_safe.sh Percona-Server/scripts/mysqld_safe.sh
55+--- Percona-Server~/scripts/mysqld_safe.sh 2013-03-04 08:26:59.000000000 -0500
56++++ Percona-Server/scripts/mysqld_safe.sh 2013-03-04 08:27:48.000000000 -0500
57 @@ -29,9 +29,6 @@
58 syslog_tag_mysqld=mysqld
59 syslog_tag_mysqld_safe=mysqld_safe
60@@ -19,10 +14,10 @@
61 -trap '' 1 2 3 15 # we shouldn't let anyone kill us
62 -trap '' 13 # not even SIGPIPE
63 -
64- umask 007
65-
66- defaults=
67-@@ -712,6 +709,12 @@
68+ # MySQL-specific environment variable. First off, it's not really a umask,
69+ # it's the desired mode. Second, it follows umask(2), not umask(3) in that
70+ # octal needs to be explicit. Our shell might be a proper sh without printf,
71+@@ -739,6 +736,12 @@
72 fi
73 fi
74
75
76=== modified file 'build/debian/percona-server-server-5.6.install'
77--- build/debian/percona-server-server-5.6.install 2013-03-05 12:46:43 +0000
78+++ build/debian/percona-server-server-5.6.install 2013-04-05 21:08:23 +0000
79@@ -22,7 +22,6 @@
80 usr/bin/replace
81 usr/bin/resolve_stack_dump
82 usr/bin/resolveip
83-usr/bin/innodb_memcached_config.sql
84 usr/sbin/mysqld
85 usr/share/man/man1/msql2mysql.1
86 usr/share/man/man1/myisamchk.1
87
88=== modified file 'build/debian/percona-server-server-5.6.postinst'
89--- build/debian/percona-server-server-5.6.postinst 2013-03-05 12:46:43 +0000
90+++ build/debian/percona-server-server-5.6.postinst 2013-04-05 21:08:23 +0000
91@@ -139,7 +139,7 @@
92 # Debian: beware of the bashisms...
93 # Debian: can safely run on upgrades with existing databases
94 set +e
95- /bin/bash ${PERCONA_PREFIX}/bin/mysql_install_db --user=mysql --rpm 2>&1 |
96+ ${PERCONA_PREFIX}/bin/mysql_install_db --user=mysql --rpm 2>&1 |
97 $ERR_LOGGER
98 if [ "$?" != "0" ]; then
99 echo "ATTENTION: An error has occured. More info is in the syslog!"
100@@ -193,7 +193,7 @@
101 "USE mysql\n" \
102 "ALTER TABLE user CHANGE Password Password char(41) character set latin1 collate latin1_bin DEFAULT '' NOT NULL"`;
103 replace_query=`/bin/echo -e \
104- "USE mysql\n" \
105+ "USE mysql;\n" \
106 "REPLACE INTO user SET " \
107 " host='localhost', user='debian-sys-maint', password=password('$pass'), " \
108 " Select_priv='Y', Insert_priv='Y', Update_priv='Y', Delete_priv='Y', " \
109@@ -203,7 +203,8 @@
110 " Create_tmp_table_priv='Y', Lock_tables_priv='Y', Execute_priv='Y', "\
111 " Repl_slave_priv='Y', Repl_client_priv='Y', Create_view_priv='Y', "\
112 " Show_view_priv='Y', Create_routine_priv='Y', Alter_routine_priv='Y', "\
113- " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y' "`;
114+ " Create_user_priv='Y', Event_priv='Y', Trigger_priv='Y', "\
115+ " ssl_cipher='', x509_issuer='', x509_subject=''; "`
116 fix_privs=`/bin/echo -e \
117 "USE mysql;\n" \
118 "ALTER TABLE user ADD column Create_view_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
119@@ -213,32 +214,13 @@
120 "ALTER TABLE user ADD column Create_user_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
121 "ALTER TABLE user ADD column Event_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " \
122 "ALTER TABLE user ADD column Trigger_priv enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N'; " `
123- # Engines supported by etch should be installed per default. The query sequence is supposed
124- # to be aborted if the CREATE TABLE fails due to an already existent table in which case the
125- # admin might already have chosen to remove one or more plugins. Newlines are necessary.
126- install_plugins=`/bin/echo -e \
127- "USE mysql;\n" \
128- "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \
129- " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \
130- " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';\n" \
131- "INSERT INTO plugin VALUES ('innodb', 'ha_innodb.so');\n" \
132- "INSERT INTO plugin VALUES ('federated', 'ha_federated.so');\n" \
133- "INSERT INTO plugin VALUES ('blackhole', 'ha_blackhole.so');\n" \
134- "INSERT INTO plugin VALUES ('archive', 'ha_archive.so');" `
135-
136- # Upgrade password column format before the root password gets set.
137- echo "$password_column_fix_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
138
139 db_get percona-server-server/root_password && rootpw="$RET"
140 if ! set_mysql_rootpw; then
141 password_error="yes"
142 fi
143
144- echo "$fix_privs" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
145 echo "$replace_query" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
146- set +e
147- echo "$install_plugins" | $MYSQL_BOOTSTRAP 2>&1 | $ERR_LOGGER
148- set -e
149 ;;
150
151 abort-upgrade|abort-remove|abort-configure)
152
153=== modified file 'build/debian/rules'
154--- build/debian/rules 2012-08-23 18:32:26 +0000
155+++ build/debian/rules 2013-04-05 21:08:23 +0000
156@@ -8,7 +8,7 @@
157 TMP=$(CURDIR)/debian/tmp/
158
159 feature_set="community"
160-compilation_comment_release="Percona Server (GPL), Release 60.1"
161+compilation_comment_release="Percona Server (GPL), Release 60.2"
162 server_suffix="-56"
163 prefix="/usr"
164
165
166=== modified file 'build/percona-server.spec'
167--- build/percona-server.spec 2012-08-28 19:20:25 +0000
168+++ build/percona-server.spec 2013-04-05 21:08:23 +0000
169@@ -25,10 +25,10 @@
170 %define mysql_vendor Oracle and/or its affiliates
171 %define percona_server_vendor Percona, Inc
172
173-%define mysql_version 5.6.6
174+%define mysql_version 5.6.10
175 %define redhatversion %(lsb_release -rs | awk -F. '{ print $1}')
176 %define majorversion 60
177-%define minorversion 1
178+%define minorversion 2
179 %define distribution rhel%{redhatversion}
180 %define percona_server_version alpha%{majorversion}.%{minorversion}
181
182@@ -998,7 +998,6 @@
183 %attr(755, root, root) %{_sbindir}/mysqld
184 %attr(755, root, root) %{_sbindir}/mysqld-debug
185 %attr(755, root, root) %{_sbindir}/rcmysql
186-%attr(755, root, root) %{_bindir}/innodb_memcached_config.sql
187 %attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
188 %attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
189 %attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so

Subscribers

People subscribed via source and target branches

to all changes: