Merge lp:~percona-core/percona-xtradb-cluster/pxc-5.5.41-pkging into lp:percona-xtradb-cluster/5.5

Proposed by Raghavendra D Prabhu on 2015-03-20
Status: Merged
Approved by: Alexey Kopytov on 2015-03-25
Approved revision: 851
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp:~percona-core/percona-xtradb-cluster/pxc-5.5.41-pkging
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 2003 lines (+907/-418)
31 files modified
Makefile-pxc (+2/-2)
build-ps/debian/changelog.ps (+8/-0)
build-ps/debian/rules (+1/-0)
build-ps/percona-xtradb-cluster.spec (+47/-40)
build-ps/rpm/mysql-systemd (+19/-3)
mysql-test/r/grant.result (+13/-0)
mysql-test/r/grant_cache_no_prot.result (+2/-0)
mysql-test/r/openssl_1.result (+2/-2)
mysql-test/r/percona_bug1354988.result (+50/-0)
mysql-test/r/percona_log_slow_sp_statements.result (+3/-3)
mysql-test/std_data/cacert.pem (+77/-15)
mysql-test/std_data/client-cert.pem (+73/-37)
mysql-test/std_data/client-key.pem (+25/-13)
mysql-test/std_data/server-cert.pem (+73/-32)
mysql-test/std_data/server-key.pem (+25/-7)
mysql-test/std_data/server8k-cert.pem (+205/-49)
mysql-test/std_data/server8k-key.pem (+97/-97)
mysql-test/t/openssl_1.test (+2/-2)
mysql-test/t/percona_bug1354988.test (+53/-0)
mysql-test/t/percona_log_slow_sp_statements.test (+3/-3)
percona-xtradb-cluster-tests/conf/conf20.cnf-node1 (+1/-1)
percona-xtradb-cluster-tests/conf/conf20.cnf-node2 (+1/-1)
percona-xtradb-cluster-tests/run.sh (+4/-1)
scripts/clustercheck.sh (+0/-92)
scripts/mysqld_safe.sh (+16/-2)
scripts/wsrep_sst_xtrabackup-v2.sh (+84/-6)
sql/log.cc (+1/-1)
sql/sql_acl.cc (+7/-3)
storage/innobase/include/univ.i (+1/-1)
storage/innobase/lock/lock0lock.c (+1/-1)
storage/innobase/srv/srv0start.c (+11/-4)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/pxc-5.5.41-pkging
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2015-03-20 Approve on 2015-03-25
Review via email: mp+253735@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile-pxc'
2--- Makefile-pxc 2014-08-22 16:34:22 +0000
3+++ Makefile-pxc 2015-03-20 19:14:12 +0000
4@@ -1,5 +1,5 @@
5-MYSQL_VERSION=5.5.39
6-PERCONA_SERVER_VERSION=rel36.0
7+MYSQL_VERSION=5.5.41
8+PERCONA_SERVER_VERSION=rel37.0
9 PERCONA_XTRADB_CLUSTER ?=Percona-XtraDB-Cluster-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
10 PERCONA_XTRADB_CLUSTER_SHORT_1 ?=Percona-XtraDB-Cluster-$(MYSQL_VERSION)
11 PERCONA_XTRADB_CLUSTER_SHORT_2 ?=Percona-XtraDB-Cluster
12
13=== modified file 'build-ps/debian/changelog.ps'
14--- build-ps/debian/changelog.ps 2014-09-02 07:29:50 +0000
15+++ build-ps/debian/changelog.ps 2015-03-20 19:14:12 +0000
16@@ -1,3 +1,11 @@
17+percona-server-5.5 (5.5.41-rel37.0) unstable; urgency=low
18+
19+ * Fixed init script timeout is too short when resizing logs (bug1328262)
20+ * mysql_install_db not handling mysqld startup failure (bug1382782)
21+ * Set MYSQL_MAINTAINER_MODE=OFF for debug build (bug1408232)
22+
23+ -- Tomislav Plavcic <tomislav.plavcic@percona.com> Wed, 07 Jan 2015 10:00:37 +0100
24+
25 percona-server-5.5 (5.5.39-rel36.0) unstable; urgency=low
26
27 * Added mysqld-debug
28
29=== modified file 'build-ps/debian/rules'
30--- build-ps/debian/rules 2015-01-04 16:27:17 +0000
31+++ build-ps/debian/rules 2015-03-20 19:14:12 +0000
32@@ -79,6 +79,7 @@
33 \
34 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
35 -DCMAKE_BUILD_TYPE=Debug \
36+ -DMYSQL_MAINTAINER_MODE=OFF \
37 -DENABLE_DTRACE=OFF \
38 -DWITH_LIBWRAP=ON \
39 -DWITH_SSL=system \
40
41=== modified file 'build-ps/percona-xtradb-cluster.spec'
42--- build-ps/percona-xtradb-cluster.spec 2015-01-04 16:27:17 +0000
43+++ build-ps/percona-xtradb-cluster.spec 2015-03-20 19:14:12 +0000
44@@ -63,27 +63,6 @@
45 %endif
46
47 #
48-%bcond_with systemd
49-#
50-%if %{with systemd}
51- %define systemd 1
52-%else
53- %if 0%{?rhel} > 6
54- %define systemd 1
55- %else
56- %define systemd 0
57- %endif
58-%endif
59-
60-%if "%rhel" > "6"
61-%define shared_lib_pri_name libmysqlclient
62-%define shared_lib_sec_name libperconaserverclient
63-%else
64-%define shared_lib_pri_name libperconaserverclient
65-%define shared_lib_sec_name libmysqlclient
66-%endif
67-
68-#
69 # Macros we use which are not available in all supported versions of RPM
70 #
71 # - defined/undefined are missing on RHEL4
72@@ -237,7 +216,7 @@
73 %define distro_description Generic Linux (kernel %{generic_kernel})
74 %define distro_releasetag linux%{generic_kernel}
75 %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel libaio-devel bison cmake
76- %define distro_requires coreutils grep procps /usr/sbin/useradd /usr/sbin/groupadd
77+ %define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
78 %endif
79
80 # ----------------------------------------------------------------------------
81@@ -376,7 +355,7 @@
82 %package -n Percona-XtraDB-Cluster-client%{product_suffix}
83 Summary: Percona XtraDB Cluster - client package
84 Group: Applications/Databases
85-Provides: mysql-client MySQL-client MySQL
86+Provides: mysql-client MySQL-client MySQL mysql
87 Conflicts: Percona-Server-client-56 Percona-Server-client-55 Percona-Server-client-51 Percona-SQL-client-50 Percona-XtraDB-Cluster-client-56
88 Obsoletes: Percona-XtraDB-Cluster-client
89 Requires: perl-DBI
90@@ -529,6 +508,7 @@
91 export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
92 export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
93 export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
94+export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-${MAKE_JFLAG:-}}
95
96 # "Fix" cmake directories in case we're crosscompiling.
97 # We detect crosscompiles to i686 if uname is x86_64 however _libdir does not
98@@ -562,6 +542,7 @@
99 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
100 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%{_prefix} \
101 -DWITH_EMBEDDED_SERVER=OFF \
102+ -DMYSQL_MAINTAINER_MODE=OFF \
103 -DENABLE_DTRACE=OFF \
104 -DWITH_SSL=system \
105 -DWITH_ZLIB=system \
106@@ -944,11 +925,6 @@
107 then
108 %{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
109 fi
110-
111-%if 0%{?systemd}
112- %tmpfiles_create mysql.conf
113-%endif
114-
115 fi
116
117 %if 0%{?systemd}
118@@ -1062,16 +1038,15 @@
119 #
120 # http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html
121
122+if [ $1 = 0 ] ; then
123 %if 0%{?systemd}
124- serv=$(systemctl list-units | grep 'mysql@.*.service' | grep 'active running' | head -1 | awk '{ print $1 }')
125- if [[ -n ${serv:-} ]] && systemctl is-active $serv;then
126+ serv=$(/usr/bin/systemctl list-units | grep 'mysql@.*.service' | grep 'active running' | head -1 | awk '{ print $1 }')
127+ if [[ -n ${serv:-} ]] && /usr/bin/systemctl is-active $serv;then
128 %systemd_preun $serv
129 else
130 %systemd_preun mysql
131 fi
132-%endif
133-
134-if [ $1 = 0 ] ; then
135+%else
136 # Stop MySQL before uninstalling it
137 if [ -x %{_sysconfdir}/init.d/mysql ] ; then
138 %{_sysconfdir}/init.d/mysql stop > /dev/null
139@@ -1084,6 +1059,7 @@
140 /sbin/insserv -r %{_sysconfdir}/init.d/mysql
141 fi
142 fi
143+%endif
144 fi
145
146 # We do not remove the mysql user since it may still own a lot of
147@@ -1128,7 +1104,7 @@
148
149 %if 0%{?systemd}
150 if [ -x %{_bindir}/systemctl ] ; then
151- %{_bindir}/systemctl enable mysqld >/dev/null 2>&1
152+ %{_bindir}/systemctl enable mysql >/dev/null 2>&1
153 fi
154 %else
155 if [ -x /sbin/chkconfig ] ; then
156@@ -1162,9 +1138,6 @@
157 echo "=====" >> $STATUS_HISTORY
158
159
160-%postun -n Percona-Server-server%{product_suffix}
161-%if 0%{?systemd}
162-%systemd_postun_with_restart mysqld
163 %endif
164
165 # ----------------------------------------------------------------------
166@@ -1418,11 +1391,45 @@
167 %postun -n Percona-XtraDB-Cluster-server%{product_suffix}
168
169 %if 0%{?systemd}
170-serv=$(systemctl list-units | grep 'mysql@.*.service' | grep 'active running' | head -1 | awk '{ print $1 }')
171-if [[ -n ${serv:-} ]] && systemctl is-active $serv;then
172- %systemd_postun_with_restart $serv
173+if [ $1 -eq 0 ];then
174+ %systemd_postun
175 else
176+ serv=$(/usr/bin/systemctl list-units | grep 'mysql@.*.service' | grep 'active running' | head -1 | awk '{ print $1 }')
177+ numint=0
178+ if [[ -n ${serv:-} ]] && /usr/bin/systemctl is-active $serv;then
179+ mysql_data=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p' | tail -n 1`
180+ if [[ -z ${mysql_data:-} ]];then
181+ echo "Unable to parse datadir with my_print_defaults, defaulting to /var/lib/mysql"
182+ mysql_data="/var/lib/mysql"
183+ fi
184+ numint=$(grep -c 'member:' $mysql_data/gvwstate.dat)
185+ if %{_bindir}/mysql -e 'select 1' &>/dev/null;then
186+ echo "$numint nodes currently up in the cluster primary component"
187+ else
188+ echo "Node is in non-PRIM, with $numint nodes in gvwstate.dat"
189+ numint=0
190+ fi
191+ if [[ $numint -gt 1 ]];then
192+ if [[ $serv != 'mysql@bootstrap.service' ]];then
193+ %systemd_postun_with_restart $serv
194+ else
195+ echo "Not bootstrapping with $(( numint-1 )) nodes already in cluster PC"
196+ echo "Restarting with mysql.service in its stead"
197+ %systemd_postun
198+ /usr/bin/systemctl stop mysql@bootstrap.service
199+ /usr/bin/systemctl start mysql.service
200+ fi
201+ elif [[ $numint -eq 1 ]];then
202+ # This doesn't second guess administrator for bootstrapping!
203+ echo "$numint nodes up, restarting $serv after upgrade"
204+ %systemd_postun_with_restart $serv
205+ else
206+ echo "Automatic restart after upgrade not feasible"
207+ echo "Restart manually after upgrade"
208+ fi
209+ else
210 %systemd_postun_with_restart mysql
211+ fi
212 fi
213 %endif
214
215
216=== modified file 'build-ps/rpm/mysql-systemd'
217--- build-ps/rpm/mysql-systemd 2014-09-02 07:29:50 +0000
218+++ build-ps/rpm/mysql-systemd 2015-03-20 19:14:12 +0000
219@@ -1,6 +1,6 @@
220 #! /bin/bash -ue
221 #
222-# Scripts to run by MySQL systemd service
223+# Scripts to run by PXC systemd service
224 #
225
226 parse_cnf()
227@@ -130,6 +130,13 @@
228 i=$(( i+1 ))
229 sleep $startup_sleep
230
231+ if [[ $verb = 'created' ]];then
232+ if ! kill -0 $manager;then
233+ log_failure_msg "mysqld_safe with PID $manager has already exited: FAILURE"
234+ exit 1
235+ fi
236+ fi
237+
238 done
239
240 if [[ -z "$i" ]]; then
241@@ -183,13 +190,22 @@
242 esac
243 fi
244
245-if [[ $action == 'reload' || $action == 'stop' ]];then
246+if [[ $action == 'reload' || $action == 'stop' || $action == 'stop-post' ]];then
247 if [[ ! -s $pid_path ]];then
248 log_failure_msg "mysql pid file $pid_path empty or not readable"
249- [[ $action == 'stop' ]] && log_warning_msg "mysql may be already dead"
250+ [[ $action == 'stop' ]] && log_failure_msg "mysql already dead"
251+ if [[ $action == 'stop-post' ]];then
252+ log_warning_msg "mysql may be already dead"
253+ exit
254+ fi
255 exit 2
256 fi
257 mysql_pid=$(cat $pid_path)
258+ if [[ $action == 'stop-post' && -n ${mysql_pid:-} ]] && ! kill -0 $mysql_pid;then
259+ log_warning_msg "mysql already dead"
260+ log_failure_msg "Stale PID file: $pid_path"
261+ exit 3
262+ fi
263 fi
264
265 if [[ $action == 'start-post' ]];then
266
267=== renamed file 'build-ps/rpm/mysqld.service' => 'build-ps/rpm/mysql.service'
268=== modified file 'mysql-test/r/grant.result'
269--- mysql-test/r/grant.result 2011-03-21 14:22:13 +0000
270+++ mysql-test/r/grant.result 2015-03-20 19:14:12 +0000
271@@ -777,6 +777,7 @@
272 Grants for mysqltest1@192.%
273 GRANT USAGE ON *.* TO 'mysqltest1'@'192.%'
274 GRANT SELECT ON `mysqltest`.`t1` TO 'mysqltest1'@'192.%'
275+GRANT DELETE ON `mysqltest`.`t1` TO 'mysqltest1'@'%'
276 show grants for mysqltest1@'%';
277 Grants for mysqltest1@%
278 GRANT USAGE ON *.* TO 'mysqltest1'@'%'
279@@ -832,6 +833,7 @@
280 Grants for mysqltest_8@%
281 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
282 GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@'%'
283+GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@''
284 select * from information_schema.schema_privileges
285 where grantee like "'mysqltest_8'%";
286 GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE IS_GRANTABLE
287@@ -871,6 +873,7 @@
288 show grants for mysqltest_8@'';
289 Grants for mysqltest_8@
290 GRANT USAGE ON *.* TO 'mysqltest_8'@''
291+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
292 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
293 show grants for mysqltest_8;
294 Grants for mysqltest_8@%
295@@ -880,11 +883,13 @@
296 show grants for mysqltest_8@'';
297 Grants for mysqltest_8@
298 GRANT USAGE ON *.* TO 'mysqltest_8'@''
299+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
300 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
301 show grants for mysqltest_8;
302 Grants for mysqltest_8@%
303 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
304 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
305+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
306 select * from information_schema.column_privileges;
307 GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME PRIVILEGE_TYPE IS_GRANTABLE
308 'mysqltest_8'@'%' def test t1 a UPDATE NO
309@@ -914,6 +919,7 @@
310 show grants for mysqltest_8@'';
311 Grants for mysqltest_8@
312 GRANT USAGE ON *.* TO 'mysqltest_8'@''
313+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
314 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
315 show grants for mysqltest_8;
316 Grants for mysqltest_8@%
317@@ -923,11 +929,13 @@
318 show grants for mysqltest_8@'';
319 Grants for mysqltest_8@
320 GRANT USAGE ON *.* TO 'mysqltest_8'@''
321+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
322 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
323 show grants for mysqltest_8;
324 Grants for mysqltest_8@%
325 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
326 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
327+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
328 select * from information_schema.table_privileges;
329 GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PRIVILEGE_TYPE IS_GRANTABLE
330 'mysqltest_8'@'%' def test t1 UPDATE NO
331@@ -960,12 +968,14 @@
332 show grants for mysqltest_8@'';
333 Grants for mysqltest_8@
334 GRANT USAGE ON *.* TO 'mysqltest_8'@''
335+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
336 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
337 GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
338 show grants for mysqltest_8;
339 Grants for mysqltest_8@%
340 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
341 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
342+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
343 select * from information_schema.user_privileges
344 where grantee like "'mysqltest_8'%";
345 GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
346@@ -978,12 +988,15 @@
347 show grants for mysqltest_8@'';
348 Grants for mysqltest_8@
349 GRANT USAGE ON *.* TO 'mysqltest_8'@''
350+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
351 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
352 GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
353 show grants for mysqltest_8;
354 Grants for mysqltest_8@%
355 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
356 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
357+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
358+GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
359 drop user mysqltest_8@'';
360 show grants for mysqltest_8@'';
361 ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host ''
362
363=== modified file 'mysql-test/r/grant_cache_no_prot.result'
364--- mysql-test/r/grant_cache_no_prot.result 2010-08-09 08:32:50 +0000
365+++ mysql-test/r/grant_cache_no_prot.result 2015-03-20 19:14:12 +0000
366@@ -121,6 +121,8 @@
367 show grants for current_user();
368 Grants for @localhost
369 GRANT USAGE ON *.* TO ''@'localhost'
370+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, EVENT, TRIGGER ON `test`.* TO ''@'%'
371+GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, EVENT, TRIGGER ON `test\_%`.* TO ''@'%'
372 ----- establish connection user2 (user=mysqltest_2) -----
373 select "user2";
374 user2
375
376=== modified file 'mysql-test/r/openssl_1.result'
377--- mysql-test/r/openssl_1.result 2014-12-12 08:03:25 +0000
378+++ mysql-test/r/openssl_1.result 2015-03-20 19:14:12 +0000
379@@ -3,8 +3,8 @@
380 insert into t1 values (5);
381 grant select on test.* to ssl_user1@localhost require SSL;
382 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
383-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
384-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
385+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
386+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
387 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
388 flush privileges;
389 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
390
391=== added file 'mysql-test/r/percona_bug1354988.result'
392--- mysql-test/r/percona_bug1354988.result 1970-01-01 00:00:00 +0000
393+++ mysql-test/r/percona_bug1354988.result 2015-03-20 19:14:12 +0000
394@@ -0,0 +1,50 @@
395+CREATE USER grantee@localhost IDENTIFIED BY 'grantee1';
396+CREATE USER grantee IDENTIFIED BY 'grantee2';
397+CREATE DATABASE db2;
398+CREATE DATABASE db3;
399+USE db3;
400+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
401+CREATE TABLE t2 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
402+INSERT INTO t2 (b) VALUES (1), (2);
403+CREATE FUNCTION f1() RETURNS INT
404+BEGIN
405+RETURN 1;
406+END |
407+CREATE PROCEDURE p1()
408+BEGIN
409+SELECT 1;
410+END |
411+GRANT ALL PRIVILEGES ON db2.* TO grantee WITH GRANT OPTION;
412+GRANT SELECT(a) ON TABLE db3.t2 TO grantee WITH GRANT OPTION;
413+GRANT ALL PRIVILEGES ON TABLE db3.t1 TO grantee WITH GRANT OPTION;
414+GRANT ALL PRIVILEGES ON FUNCTION db3.f1 TO grantee WITH GRANT OPTION;
415+GRANT ALL PRIVILEGES ON PROCEDURE db3.p1 TO grantee WITH GRANT OPTION;
416+SELECT user(), current_user();
417+user() current_user()
418+grantee@localhost grantee@localhost
419+SHOW GRANTS;
420+Grants for grantee@localhost
421+GRANT USAGE ON *.* TO 'grantee'@'localhost' IDENTIFIED BY PASSWORD '*9823FF338D44DAF02422CF24DD1F879FB4F6B232'
422+GRANT ALL PRIVILEGES ON `db2`.* TO 'grantee'@'%' WITH GRANT OPTION
423+GRANT SELECT (a) ON `db3`.`t2` TO 'grantee'@'%' WITH GRANT OPTION
424+GRANT ALL PRIVILEGES ON `db3`.`t1` TO 'grantee'@'%' WITH GRANT OPTION
425+GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `db3`.`p1` TO 'grantee'@'%' WITH GRANT OPTION
426+GRANT EXECUTE, ALTER ROUTINE ON FUNCTION `db3`.`f1` TO 'grantee'@'%' WITH GRANT OPTION
427+USE db2;
428+CREATE TABLE t1(f1 int);
429+USE db3;
430+SELECT a FROM t2;
431+a
432+1
433+2
434+INSERT INTO t1 (b) VALUES (1), (2);
435+SELECT f1();
436+f1()
437+1
438+CALL p1();
439+1
440+1
441+DROP DATABASE db2;
442+DROP DATABASE db3;
443+DROP USER grantee@localhost;
444+DROP USER grantee;
445
446=== modified file 'mysql-test/r/percona_log_slow_sp_statements.result'
447--- mysql-test/r/percona_log_slow_sp_statements.result 2014-12-01 21:13:37 +0000
448+++ mysql-test/r/percona_log_slow_sp_statements.result 2015-03-20 19:14:12 +0000
449@@ -32,9 +32,9 @@
450 [log_grep.inc] lines: 2
451 [log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_
452 [log_grep.inc] lines: 0
453-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_outer
454+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_outer
455 [log_grep.inc] lines: 2
456-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_inner
457+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_inner
458 [log_grep.inc] lines: 2
459 SET GLOBAL log_slow_sp_statements=OFF;
460 [log_start.inc] percona.slow_extended.sp2
461@@ -55,7 +55,7 @@
462 [log_grep.inc] lines: 0
463 [log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_
464 [log_grep.inc] lines: 2
465-[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored routine: test.test_
466+[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored_routine: test.test_
467 [log_grep.inc] lines: 0
468 DROP PROCEDURE test_outer;
469 DROP PROCEDURE test_inner;
470
471=== modified file 'mysql-test/std_data/cacert.pem'
472--- mysql-test/std_data/cacert.pem 2010-01-29 14:54:27 +0000
473+++ mysql-test/std_data/cacert.pem 2015-03-20 19:14:12 +0000
474@@ -1,17 +1,79 @@
475+Certificate:
476+ Data:
477+ Version: 3 (0x2)
478+ Serial Number: 16263805969935345171 (0xe1b4a55c3ddfa613)
479+ Signature Algorithm: sha256WithRSAEncryption
480+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
481+ Validity
482+ Not Before: Dec 5 04:48:11 2014 GMT
483+ Not After : Dec 1 04:48:11 2030 GMT
484+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
485+ Subject Public Key Info:
486+ Public Key Algorithm: rsaEncryption
487+ Public-Key: (2048 bit)
488+ Modulus:
489+ 00:b4:95:bd:24:92:73:06:22:01:13:28:0e:09:a3:
490+ 94:05:96:54:9d:dc:8f:83:39:f3:64:7a:31:70:f6:
491+ d9:c4:14:19:75:87:a6:b1:ea:52:ed:40:54:5a:f6:
492+ 9c:13:8e:d8:76:8f:5a:65:a5:20:19:19:bd:51:9d:
493+ ba:35:ce:9a:a9:58:0a:fc:11:6e:1d:cb:a8:f1:92:
494+ 79:ee:aa:fc:e3:32:5e:aa:0d:0b:23:34:95:e9:d3:
495+ 8e:3f:72:93:90:bc:2c:b0:04:75:4f:a4:4a:a0:32:
496+ db:ac:89:ac:34:9b:d0:07:e3:81:e9:ca:5b:26:f0:
497+ f5:de:fe:d5:5e:a0:54:26:dd:ec:58:07:6e:b9:e5:
498+ 97:f6:20:6d:d8:4a:c0:50:cc:81:e6:d2:3f:c7:47:
499+ 70:8b:15:89:65:71:2e:47:c3:42:76:b5:ee:16:0e:
500+ 26:97:6a:a3:1c:ad:90:53:50:b0:b1:6d:1d:b0:b8:
501+ 6d:df:3c:ee:bd:3b:87:e8:db:4d:3a:72:78:dd:db:
502+ 40:3d:c9:20:46:b8:4e:33:bb:76:b7:4f:b2:79:da:
503+ 03:cc:f9:75:c0:1d:4c:51:0a:b9:9b:25:34:50:11:
504+ 97:df:82:46:02:a9:bc:98:51:3e:c3:df:57:ad:b7:
505+ 28:be:de:65:ce:2b:f3:2c:22:f5:af:31:28:1c:ef:
506+ 10:09
507+ Exponent: 65537 (0x10001)
508+ X509v3 extensions:
509+ X509v3 Subject Key Identifier:
510+ 94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
511+ X509v3 Authority Key Identifier:
512+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
513+
514+ X509v3 Basic Constraints:
515+ CA:TRUE
516+ Signature Algorithm: sha256WithRSAEncryption
517+ 32:97:4c:af:bf:ca:e0:10:66:b7:cc:8b:0d:05:d1:d2:ca:b8:
518+ 0c:c2:78:57:1f:f6:55:9c:74:fc:bd:31:58:05:18:bc:6d:b5:
519+ 79:9a:22:8c:1f:da:33:ea:ef:db:e3:cb:46:bc:36:91:8b:d8:
520+ 36:8d:06:40:c2:e9:fe:79:1b:4a:c5:70:74:6d:9d:92:2c:90:
521+ be:3c:a7:88:03:e4:b7:ef:f4:b0:00:34:ec:8f:d1:c3:23:2b:
522+ ef:bc:ff:ab:a2:0e:bc:ba:11:a5:8e:44:80:fa:d6:f4:26:66:
523+ 84:64:2c:e3:23:62:0c:e2:ba:01:ab:5f:24:d6:9d:7e:9c:7b:
524+ f4:5d:0e:ba:64:35:6e:a5:fa:98:0c:57:f3:72:e8:3e:2e:ce:
525+ b3:f9:e3:fa:ee:aa:79:f9:06:01:19:b2:b3:28:ff:f4:d6:bb:
526+ 17:bb:a6:a0:e0:45:23:f3:61:40:31:5c:a3:ee:88:1c:00:31:
527+ 54:96:f9:71:37:b5:7f:66:6a:af:04:94:09:39:99:b3:88:86:
528+ 9e:bb:d6:36:24:24:f4:37:2c:a6:6c:0b:35:2e:bb:40:af:a7:
529+ 64:8a:7f:f2:74:e3:94:0c:32:bd:31:3d:d9:79:68:0f:1e:4b:
530+ 17:c0:4e:df:85:3c:f0:84:df:58:f1:d2:4d:2f:ad:ff:1b:d7:
531+ c8:9b:fe:dc
532 -----BEGIN CERTIFICATE-----
533-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
534-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
535-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
536-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
537-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
538-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
539-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
540-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
541-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
542-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
543-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
544-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
545-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
546-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
547-7F4WeS07J8LKardSvM0+hOA=
548+MIIDmTCCAoGgAwIBAgIJAOG0pVw936YTMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
549+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
550+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
551+MTQxMjA1MDQ0ODExWhcNMzAxMjAxMDQ0ODExWjBjMQswCQYDVQQGEwJTRTESMBAG
552+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
553+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
554+AQEFAAOCAQ8AMIIBCgKCAQEAtJW9JJJzBiIBEygOCaOUBZZUndyPgznzZHoxcPbZ
555+xBQZdYemsepS7UBUWvacE47Ydo9aZaUgGRm9UZ26Nc6aqVgK/BFuHcuo8ZJ57qr8
556+4zJeqg0LIzSV6dOOP3KTkLwssAR1T6RKoDLbrImsNJvQB+OB6cpbJvD13v7VXqBU
557+Jt3sWAduueWX9iBt2ErAUMyB5tI/x0dwixWJZXEuR8NCdrXuFg4ml2qjHK2QU1Cw
558+sW0dsLht3zzuvTuH6NtNOnJ43dtAPckgRrhOM7t2t0+yedoDzPl1wB1MUQq5myU0
559+UBGX34JGAqm8mFE+w99Xrbcovt5lzivzLCL1rzEoHO8QCQIDAQABo1AwTjAdBgNV
560+HQ4EFgQUlGWho4fPv8F0u9iEl7Zr7rKQc7IwHwYDVR0jBBgwFoAUlGWho4fPv8F0
561+u9iEl7Zr7rKQc7IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMpdM
562+r7/K4BBmt8yLDQXR0sq4DMJ4Vx/2VZx0/L0xWAUYvG21eZoijB/aM+rv2+PLRrw2
563+kYvYNo0GQMLp/nkbSsVwdG2dkiyQvjyniAPkt+/0sAA07I/RwyMr77z/q6IOvLoR
564+pY5EgPrW9CZmhGQs4yNiDOK6AatfJNadfpx79F0OumQ1bqX6mAxX83LoPi7Os/nj
565++u6qefkGARmysyj/9Na7F7umoOBFI/NhQDFco+6IHAAxVJb5cTe1f2ZqrwSUCTmZ
566+s4iGnrvWNiQk9DcspmwLNS67QK+nZIp/8nTjlAwyvTE92XloDx5LF8BO34U88ITf
567+WPHSTS+t/xvXyJv+3A==
568 -----END CERTIFICATE-----
569
570=== modified file 'mysql-test/std_data/client-cert.pem'
571--- mysql-test/std_data/client-cert.pem 2010-01-29 14:54:27 +0000
572+++ mysql-test/std_data/client-cert.pem 2015-03-20 19:14:12 +0000
573@@ -1,46 +1,82 @@
574 Certificate:
575 Data:
576- Version: 1 (0x0)
577- Serial Number: 1048577 (0x100001)
578- Signature Algorithm: md5WithRSAEncryption
579- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
580+ Version: 3 (0x2)
581+ Serial Number: 16263805969935345173 (0xe1b4a55c3ddfa615)
582+ Signature Algorithm: sha256WithRSAEncryption
583+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
584 Validity
585- Not Before: Jan 29 11:50:22 2010 GMT
586- Not After : Jan 28 11:50:22 2015 GMT
587- Subject: C=SE, ST=Uppsala, O=MySQL AB
588+ Not Before: Dec 5 04:49:23 2014 GMT
589+ Not After : Dec 1 04:49:23 2029 GMT
590+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
591 Subject Public Key Info:
592 Public Key Algorithm: rsaEncryption
593- Public-Key: (1024 bit)
594+ Public-Key: (2048 bit)
595 Modulus:
596- 00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
597- 78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
598- a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
599- 9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
600- 15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
601- 87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
602- 8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
603- a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
604- fc:3d:78:9b:49:6e:86:83:77
605+ 00:c8:d1:a1:fe:a4:8c:f3:1b:17:71:1b:74:35:11:
606+ e0:0e:6c:40:0a:fb:c0:f7:f0:eb:bb:c9:1d:a1:c7:
607+ d7:b0:8a:f6:f1:cf:fa:6b:d0:79:64:eb:bb:69:a5:
608+ 0d:80:06:df:52:14:d2:85:32:cf:bf:ce:2a:47:28:
609+ 5b:cd:0b:28:ab:bb:07:33:d5:8b:d3:b4:72:c4:a6:
610+ b5:cc:37:b9:03:a8:78:56:25:58:1f:17:30:7c:d1:
611+ 0a:bb:ec:3c:a3:03:90:97:99:92:49:ae:b3:57:96:
612+ 5c:1a:e9:e8:02:23:ae:c8:c9:05:50:63:e5:77:a1:
613+ 9a:73:06:74:0e:46:50:28:d8:c9:4f:c4:1c:37:b8:
614+ 52:18:0b:af:19:2b:d4:e5:66:74:a4:f3:f0:da:09:
615+ 30:f7:bc:0c:c9:9b:ce:57:06:04:27:e5:a1:2f:2b:
616+ a0:ba:b7:99:69:9d:46:fc:21:b6:45:81:9d:b2:3d:
617+ 2f:76:15:78:b5:33:62:ac:1e:6b:66:dd:27:61:0a:
618+ 47:02:20:2b:57:bb:32:20:dd:06:4c:76:a4:9b:72:
619+ 42:4c:9c:2c:76:72:12:1f:4b:df:1e:11:1f:a9:06:
620+ 54:dc:88:12:b0:49:d5:40:83:ef:7e:48:43:86:7a:
621+ 37:a6:c1:d7:9b:fe:08:34:98:e0:54:3c:30:4f:79:
622+ 15:29
623 Exponent: 65537 (0x10001)
624- Signature Algorithm: md5WithRSAEncryption
625- 5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
626- 34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
627- c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
628- 01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
629- 89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
630- 02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
631- 02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
632- 32:0b
633+ X509v3 extensions:
634+ X509v3 Basic Constraints:
635+ CA:FALSE
636+ Netscape Comment:
637+ OpenSSL Generated Certificate
638+ X509v3 Subject Key Identifier:
639+ 26:0C:90:BC:97:12:9E:43:BB:5E:FE:EB:A9:66:B3:C3:EE:B2:18:CB
640+ X509v3 Authority Key Identifier:
641+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
642+
643+ Signature Algorithm: sha256WithRSAEncryption
644+ 3e:3c:1f:6c:5b:83:d1:71:15:f5:45:52:fc:7f:67:bc:af:c5:
645+ 92:f5:74:78:13:43:3c:fe:b5:61:bf:00:47:43:45:a0:b9:dd:
646+ a1:10:0c:29:69:2a:6f:7d:67:3d:1e:09:b5:15:74:bf:73:11:
647+ e6:e9:09:b6:6b:b5:cc:1e:06:fd:bd:3a:11:d3:44:bd:ca:7a:
648+ a1:f1:09:43:fc:bf:83:89:3a:b1:18:40:f3:cf:6d:12:ef:6e:
649+ 0c:b7:a4:99:03:8a:4f:0c:3c:2c:23:78:35:2a:99:ea:de:9c:
650+ 1b:e8:8d:19:fb:44:80:13:89:81:c5:05:4b:a7:66:6b:c0:31:
651+ 41:f0:6c:60:aa:ec:d3:4c:ff:c1:3b:d5:bb:0d:42:7d:37:5e:
652+ 80:e7:9c:7e:60:90:0f:a4:4e:70:20:9c:b1:e4:1b:70:65:b0:
653+ ef:bb:41:16:ed:ad:46:ce:34:d3:02:3d:dd:e2:50:fa:3c:5d:
654+ f0:e2:71:f8:9a:ef:a3:32:25:c5:8e:64:f4:46:e1:f4:c0:69:
655+ d2:34:56:8d:d9:c2:6e:b6:55:3b:6a:4d:b6:d2:84:ab:85:7b:
656+ cb:fd:b4:73:40:ba:5d:49:e2:0d:39:77:17:01:49:bb:72:8b:
657+ 3a:c9:b1:e2:cd:13:d2:9c:ce:7d:6c:a8:f0:32:c9:a4:af:56:
658+ 6f:8a:e6:88
659 -----BEGIN CERTIFICATE-----
660-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
661-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
662-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
663-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
664-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
665-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
666-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
667-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
668-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
669-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
670-RrLFnG84kYo1Mgs=
671+MIIDyDCCArCgAwIBAgIJAOG0pVw936YVMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
672+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
673+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
674+MTQxMjA1MDQ0OTIzWhcNMjkxMjAxMDQ0OTIzWjBnMQswCQYDVQQGEwJTRTESMBAG
675+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
676+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBkNsaWVudDCCASIwDQYJKoZI
677+hvcNAQEBBQADggEPADCCAQoCggEBAMjRof6kjPMbF3EbdDUR4A5sQAr7wPfw67vJ
678+HaHH17CK9vHP+mvQeWTru2mlDYAG31IU0oUyz7/OKkcoW80LKKu7BzPVi9O0csSm
679+tcw3uQOoeFYlWB8XMHzRCrvsPKMDkJeZkkmus1eWXBrp6AIjrsjJBVBj5XehmnMG
680+dA5GUCjYyU/EHDe4UhgLrxkr1OVmdKTz8NoJMPe8DMmbzlcGBCfloS8roLq3mWmd
681+RvwhtkWBnbI9L3YVeLUzYqwea2bdJ2EKRwIgK1e7MiDdBkx2pJtyQkycLHZyEh9L
682+3x4RH6kGVNyIErBJ1UCD735IQ4Z6N6bB15v+CDSY4FQ8ME95FSkCAwEAAaN7MHkw
683+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
684+dGlmaWNhdGUwHQYDVR0OBBYEFCYMkLyXEp5Du17+66lms8PushjLMB8GA1UdIwQY
685+MBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQA+PB9s
686+W4PRcRX1RVL8f2e8r8WS9XR4E0M8/rVhvwBHQ0Wgud2hEAwpaSpvfWc9Hgm1FXS/
687+cxHm6Qm2a7XMHgb9vToR00S9ynqh8QlD/L+DiTqxGEDzz20S724Mt6SZA4pPDDws
688+I3g1Kpnq3pwb6I0Z+0SAE4mBxQVLp2ZrwDFB8GxgquzTTP/BO9W7DUJ9N16A55x+
689+YJAPpE5wIJyx5BtwZbDvu0EW7a1GzjTTAj3d4lD6PF3w4nH4mu+jMiXFjmT0RuH0
690+wGnSNFaN2cJutlU7ak220oSrhXvL/bRzQLpdSeINOXcXAUm7cos6ybHizRPSnM59
691+bKjwMsmkr1ZviuaI
692 -----END CERTIFICATE-----
693
694=== modified file 'mysql-test/std_data/client-key.pem'
695--- mysql-test/std_data/client-key.pem 2010-01-29 14:54:27 +0000
696+++ mysql-test/std_data/client-key.pem 2015-03-20 19:14:12 +0000
697@@ -1,15 +1,27 @@
698 -----BEGIN RSA PRIVATE KEY-----
699-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
737 -----END RSA PRIVATE KEY-----
738
739=== modified file 'mysql-test/std_data/server-cert.pem'
740--- mysql-test/std_data/server-cert.pem 2010-01-29 14:54:27 +0000
741+++ mysql-test/std_data/server-cert.pem 2015-03-20 19:14:12 +0000
742@@ -1,41 +1,82 @@
743 Certificate:
744 Data:
745- Version: 1 (0x0)
746- Serial Number: 1048578 (0x100002)
747- Signature Algorithm: md5WithRSAEncryption
748- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
749+ Version: 3 (0x2)
750+ Serial Number: 16263805969935345172 (0xe1b4a55c3ddfa614)
751+ Signature Algorithm: sha256WithRSAEncryption
752+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
753 Validity
754- Not Before: Jan 29 11:56:49 2010 GMT
755- Not After : Jan 28 11:56:49 2015 GMT
756- Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
757+ Not Before: Dec 5 04:48:40 2014 GMT
758+ Not After : Dec 1 04:48:40 2029 GMT
759+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=localhost
760 Subject Public Key Info:
761 Public Key Algorithm: rsaEncryption
762- Public-Key: (512 bit)
763+ Public-Key: (2048 bit)
764 Modulus:
765- 00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
766- 1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
767- c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
768- 5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
769- d8:88:2b:c2:ed
770+ 00:e9:20:e7:05:51:07:3a:48:b9:e2:62:a2:24:45:
771+ 1f:f1:54:34:22:5c:62:86:9b:01:e8:c2:45:90:00:
772+ 8d:4e:e4:a2:ea:e9:d7:b5:95:25:ce:18:ac:1a:4f:
773+ b3:e6:30:46:af:20:13:40:84:df:21:dc:df:09:e5:
774+ a0:7f:81:12:6e:1e:84:58:5c:a1:11:db:aa:b6:04:
775+ e0:fc:1e:0c:11:2e:f3:30:62:1a:f9:ee:df:fe:a3:
776+ d3:d6:83:6e:ad:e8:8d:98:89:b1:69:63:b8:72:f4:
777+ 5a:e6:22:5e:73:64:95:ef:56:92:92:0b:e1:93:a5:
778+ d7:4c:41:47:e7:31:ed:09:68:b3:c5:6e:c1:1b:01:
779+ 39:bb:f1:8f:bf:ba:f4:02:e2:e5:e5:9e:b7:d6:9a:
780+ b2:94:76:9b:48:d8:27:18:0e:9f:30:98:f5:9a:3e:
781+ 23:e6:3b:4a:48:ee:a5:26:e8:80:94:37:e4:4a:ba:
782+ ff:9f:42:b9:32:dd:7a:9d:63:11:a8:25:99:b1:1f:
783+ 86:e5:7c:b1:31:e3:12:11:0c:eb:f6:1d:02:4b:1d:
784+ 34:cb:74:1d:7f:2f:40:c0:81:e2:04:d4:8e:ea:96:
785+ f8:22:35:8e:ab:b6:99:33:36:ef:b5:83:11:88:6d:
786+ 06:0f:76:4d:bf:db:a8:df:6c:3c:91:e2:ba:73:a0:
787+ 73:45
788 Exponent: 65537 (0x10001)
789- Signature Algorithm: md5WithRSAEncryption
790- 73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
791- d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
792- a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
793- 6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
794- c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
795- f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
796- ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
797- fb:3c
798+ X509v3 extensions:
799+ X509v3 Basic Constraints:
800+ CA:FALSE
801+ Netscape Comment:
802+ OpenSSL Generated Certificate
803+ X509v3 Subject Key Identifier:
804+ E4:31:D8:D5:06:EA:C6:B3:A2:F6:01:39:8F:58:08:36:2C:7B:3F:DB
805+ X509v3 Authority Key Identifier:
806+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
807+
808+ Signature Algorithm: sha256WithRSAEncryption
809+ 46:ef:cd:bf:c1:ef:36:a9:cb:99:b5:be:e2:a7:ba:69:0d:f5:
810+ 9b:63:39:78:32:35:01:a8:b9:f1:70:0e:b5:d1:8f:94:2e:7a:
811+ cb:65:d4:d0:b4:ad:52:b8:51:5f:64:2e:a8:08:a5:71:fe:c2:
812+ 35:8a:0d:28:26:e5:be:ca:d7:f4:79:54:e1:27:8f:87:92:d3:
813+ 04:72:1b:cc:c4:7f:8b:26:09:92:2d:c8:6f:27:da:97:31:80:
814+ 0f:83:84:9c:e0:a4:88:c9:e3:8f:35:e7:de:bd:31:e2:fa:52:
815+ 83:de:ee:5c:60:6e:8f:a5:8d:5e:53:41:18:42:f3:03:0b:05:
816+ 0b:59:09:42:2e:1b:0b:29:b3:fe:11:3b:d5:ad:3f:4d:24:e8:
817+ c0:da:4c:0d:93:94:ec:cd:18:0f:66:cd:03:d3:ee:a0:b2:7f:
818+ 64:d7:39:66:19:72:9f:64:43:38:b4:b6:b3:ea:6f:39:e7:09:
819+ 98:90:9f:6c:f5:e8:b3:2e:09:8d:7b:76:65:30:f4:c4:9b:8e:
820+ 10:4e:9b:8c:93:63:44:9d:2b:8a:f3:f0:cf:f8:7b:65:95:38:
821+ fb:b4:92:e8:6c:11:03:a2:a2:2f:ea:e0:22:b7:cd:cf:0d:a5:
822+ 91:23:14:47:0c:34:8f:f1:11:cc:e8:1e:37:53:ec:a1:01:81:
823+ 20:c0:2c:f5
824 -----BEGIN CERTIFICATE-----
825-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
826-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
827-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
828-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
829-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
830-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
831-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
832-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
833-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
834-UYHigzBuPTib+zw=
835+MIIDyzCCArOgAwIBAgIJAOG0pVw936YUMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
836+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
837+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
838+MTQxMjA1MDQ0ODQwWhcNMjkxMjAxMDQ0ODQwWjBqMQswCQYDVQQGEwJTRTESMBAG
839+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
840+YWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJ
841+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkg5wVRBzpIueJioiRFH/FUNCJcYoab
842+AejCRZAAjU7kourp17WVJc4YrBpPs+YwRq8gE0CE3yHc3wnloH+BEm4ehFhcoRHb
843+qrYE4PweDBEu8zBiGvnu3/6j09aDbq3ojZiJsWljuHL0WuYiXnNkle9WkpIL4ZOl
844+10xBR+cx7Qlos8VuwRsBObvxj7+69ALi5eWet9aaspR2m0jYJxgOnzCY9Zo+I+Y7
845+SkjupSbogJQ35Eq6/59CuTLdep1jEaglmbEfhuV8sTHjEhEM6/YdAksdNMt0HX8v
846+QMCB4gTUjuqW+CI1jqu2mTM277WDEYhtBg92Tb/bqN9sPJHiunOgc0UCAwEAAaN7
847+MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
848+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFOQx2NUG6sazovYBOY9YCDYsez/bMB8GA1Ud
849+IwQYMBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQBG
850+782/we82qcuZtb7ip7ppDfWbYzl4MjUBqLnxcA610Y+ULnrLZdTQtK1SuFFfZC6o
851+CKVx/sI1ig0oJuW+ytf0eVThJ4+HktMEchvMxH+LJgmSLchvJ9qXMYAPg4Sc4KSI
852+yeOPNefevTHi+lKD3u5cYG6PpY1eU0EYQvMDCwULWQlCLhsLKbP+ETvVrT9NJOjA
853+2kwNk5TszRgPZs0D0+6gsn9k1zlmGXKfZEM4tLaz6m855wmYkJ9s9eizLgmNe3Zl
854+MPTEm44QTpuMk2NEnSuK8/DP+HtllTj7tJLobBEDoqIv6uAit83PDaWRIxRHDDSP
855+8RHM6B43U+yhAYEgwCz1
856 -----END CERTIFICATE-----
857
858=== modified file 'mysql-test/std_data/server-key.pem'
859--- mysql-test/std_data/server-key.pem 2010-01-29 14:54:27 +0000
860+++ mysql-test/std_data/server-key.pem 2015-03-20 19:14:12 +0000
861@@ -1,9 +1,27 @@
862 -----BEGIN RSA PRIVATE KEY-----
863-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
895 -----END RSA PRIVATE KEY-----
896
897=== modified file 'mysql-test/std_data/server8k-cert.pem'
898--- mysql-test/std_data/server8k-cert.pem 2010-07-28 15:59:19 +0000
899+++ mysql-test/std_data/server8k-cert.pem 2015-03-20 19:14:12 +0000
900@@ -1,51 +1,207 @@
901+Certificate:
902+ Data:
903+ Version: 3 (0x2)
904+ Serial Number: 10754692786786449447 (0x9540581bd8dcb827)
905+ Signature Algorithm: sha256WithRSAEncryption
906+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
907+ Validity
908+ Not Before: Dec 5 04:50:48 2014 GMT
909+ Not After : Dec 1 04:50:48 2029 GMT
910+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Server
911+ Subject Public Key Info:
912+ Public Key Algorithm: rsaEncryption
913+ Public-Key: (8192 bit)
914+ Modulus:
915+ 00:d8:8f:9d:66:66:9c:12:ca:0a:ad:9e:9f:05:66:
916+ 6c:6c:8a:db:19:9f:a2:d0:fa:38:dc:de:c5:a6:94:
917+ 60:0d:4b:72:c9:85:e2:ff:27:c8:d4:ce:b1:29:66:
918+ 31:e7:2b:4e:08:b3:a2:71:cf:1e:36:7c:8e:4d:08:
919+ 6e:fd:7a:ea:c1:0d:5c:97:09:66:fa:ed:0b:36:64:
920+ 8f:cc:39:35:a9:43:6c:a9:17:48:0f:2e:0a:4b:d3:
921+ 94:bb:b0:5b:43:f1:4e:f7:e5:30:e1:ae:a2:a8:5d:
922+ 3c:db:39:df:d6:4b:70:a6:c9:68:c3:f3:9d:19:d7:
923+ 2f:2a:38:31:11:ab:f1:60:66:c3:38:4f:d9:6f:b5:
924+ 49:df:ce:14:b5:fa:c8:95:04:50:69:90:9d:26:c2:
925+ e9:07:69:7b:a2:d8:91:e7:cd:de:c4:ed:9c:e4:c8:
926+ 8c:e3:a0:cd:dd:2b:37:21:8f:ee:54:38:91:2b:2b:
927+ 01:86:90:f0:2e:9a:06:8a:e1:f2:a2:3f:d1:d4:21:
928+ 9f:b0:81:eb:d0:e9:d3:e9:a9:28:6e:c2:06:4b:94:
929+ 6e:96:70:f5:31:33:dd:97:2f:cc:5d:80:c5:74:ce:
930+ c0:3d:b2:6a:81:b7:ce:65:4f:6a:49:3e:c9:5d:00:
931+ 3c:06:4a:57:c9:a7:f9:bb:46:50:df:64:dc:13:1f:
932+ 22:ad:21:0b:aa:4b:5d:94:60:9f:20:ff:28:aa:56:
933+ 5f:f6:cd:23:34:fe:44:a2:d6:80:bd:a9:67:00:d6:
934+ a1:82:82:9f:c9:e8:0c:97:26:1e:a9:b1:e2:ee:01:
935+ ef:9d:c6:82:fc:72:33:02:40:35:cc:ae:51:23:f4:
936+ f8:92:29:d3:2f:5c:1f:03:c6:81:7d:fb:4f:e9:de:
937+ ed:68:3c:a1:be:7c:fa:11:96:2b:5a:10:c5:c5:cb:
938+ 2e:7a:54:4c:7b:12:b8:07:01:d9:b5:38:0f:a6:43:
939+ 70:28:81:8d:d7:95:ad:d6:e8:88:b4:19:62:05:7b:
940+ 75:c0:2d:24:72:1c:4d:04:a3:f7:1d:6b:8b:fa:16:
941+ a3:5a:6c:51:ba:5c:62:fa:3e:82:7f:4e:10:db:d0:
942+ 52:d4:81:df:0e:5b:33:7e:20:77:1d:51:ca:4e:13:
943+ ee:cd:72:36:28:b4:31:88:3d:61:0f:1a:80:19:f6:
944+ 7d:71:5d:21:1f:dd:0b:d9:73:88:a9:72:4b:8d:a3:
945+ d6:f1:4f:5d:01:6e:9e:c2:28:97:80:de:5b:2d:ac:
946+ a3:c9:24:db:e9:0f:2b:36:ee:a7:f2:94:c1:41:7a:
947+ 70:9f:fd:d0:31:a9:de:55:38:65:89:20:f4:02:f1:
948+ 83:73:40:77:db:35:d2:66:ff:26:5f:f4:d2:e6:f9:
949+ ba:fc:6a:66:b1:02:24:04:a3:32:4b:21:85:83:b4:
950+ 6a:97:3c:25:7f:65:cc:a6:dd:cc:ac:e5:22:09:58:
951+ dc:a1:0d:7d:b4:ac:98:98:81:1d:a7:83:d4:3a:e4:
952+ 39:a7:04:6a:b6:b7:5d:a8:fe:0e:47:08:1d:95:61:
953+ eb:a8:97:53:91:1e:ca:1f:3f:19:5a:01:73:da:33:
954+ 32:d7:33:ca:39:1e:00:37:6b:f8:18:47:30:3a:2e:
955+ 99:39:d0:d0:49:6d:87:c1:98:59:d0:21:ca:12:6d:
956+ 89:33:0f:f2:52:6e:d6:c5:78:dd:15:b6:11:d6:5e:
957+ 72:e8:c7:12:00:c3:8d:57:34:e5:d8:6d:a2:e8:47:
958+ 79:83:8c:49:17:3b:75:24:0d:de:e1:3b:dd:bc:b7:
959+ df:89:a6:31:e6:49:37:80:f8:8f:86:e3:42:f4:2e:
960+ dc:de:58:45:c4:41:a9:2d:a6:5d:f0:7d:81:3d:54:
961+ f4:8a:a3:5f:18:7c:02:c9:7f:1c:f5:9f:dd:0a:29:
962+ 49:40:92:24:b3:b7:65:37:91:9a:a8:00:c4:4e:7f:
963+ 7e:f7:97:de:24:2a:d7:3b:f2:a2:63:ec:38:b7:1f:
964+ 9e:b5:72:99:bd:b1:c0:41:6a:57:97:e2:fb:11:32:
965+ ba:a3:5d:82:48:c5:0a:cc:2c:f5:21:7a:f1:99:56:
966+ 1b:54:9d:c7:64:50:62:80:94:50:5a:40:32:61:f3:
967+ 2c:f8:09:dc:f0:6d:2b:60:29:c2:86:70:5a:57:12:
968+ 7d:09:73:ca:41:6d:22:61:18:1a:48:cb:80:95:be:
969+ 08:e8:15:99:de:36:3a:bf:09:67:35:e8:53:d9:40:
970+ 1b:27:e5:14:32:09:73:e0:f6:a9:19:ee:81:90:dc:
971+ b7:9d:b6:91:51:33:1e:1f:22:e0:bd:df:a8:d1:33:
972+ a7:ab:9b:9c:27:7a:3c:ef:aa:9e:4d:f8:a8:97:63:
973+ 24:20:c8:36:ab:05:8a:c0:80:9b:64:0c:1f:ec:4f:
974+ de:ec:f0:9c:9c:54:db:02:ab:12:aa:ab:58:a3:49:
975+ 25:bf:6a:0a:04:7f:2f:1d:41:11:23:4e:e2:83:51:
976+ e3:f5:12:95:22:72:13:f4:be:6f:e2:00:29:4f:fe:
977+ 9b:ae:b9:e2:7d:72:d3:1b:e8:12:3b:6d:b6:d2:62:
978+ a4:91:31:46:e7:16:7f:9d:8d:74:5e:97:51:d1:cb:
979+ 82:57:bb:bd:46:e4:9c:c5:bd:08:8b:68:20:f8:5e:
980+ d6:aa:ed:6e:4d:ba:a4:29:fd:ac:5c:2f:25:14:d3:
981+ 19:63:0c:01:75:6c:87:a5:0b:29:09:7f:13:7f:00:
982+ d4:63:72:e2:a0:39:88:80:68:2c:3f:49:b1:9b:94:
983+ 77:63:08:05:55
984+ Exponent: 65537 (0x10001)
985+ X509v3 extensions:
986+ X509v3 Basic Constraints:
987+ CA:FALSE
988+ Netscape Comment:
989+ OpenSSL Generated Certificate
990+ X509v3 Subject Key Identifier:
991+ 3E:96:BB:23:C2:FD:41:11:7F:EB:63:9B:39:5F:58:2D:92:A0:F0:9F
992+ X509v3 Authority Key Identifier:
993+ keyid:60:57:8F:09:CF:83:86:4B:35:32:BF:73:EB:81:4C:DB:36:27:12:8F
994+
995+ Signature Algorithm: sha256WithRSAEncryption
996+ 19:b8:4d:94:a3:41:1b:78:e8:fa:da:7c:c3:0c:f5:42:6a:2e:
997+ 04:8c:f4:6e:90:e0:d1:55:28:7c:97:85:18:12:c4:ff:d3:ba:
998+ 74:f1:7f:af:b0:ab:4d:64:f4:45:58:6e:b1:2e:06:cc:a7:5b:
999+ cd:25:8f:60:68:14:e1:f9:56:21:40:43:e4:c4:ee:91:72:01:
1000+ 7d:86:41:2f:ac:6d:be:c6:1a:2a:ae:dd:13:ca:51:01:37:33:
1001+ 7e:b9:1a:9a:28:16:8c:bc:d1:e7:d4:46:55:87:1f:05:93:4c:
1002+ b5:75:ff:ed:ca:29:b2:5d:15:05:4c:02:a9:53:3c:d9:11:01:
1003+ 04:db:82:ad:01:ad:4e:d4:7d:9e:6a:00:5e:cc:88:83:42:98:
1004+ 6e:4b:cd:7c:55:c6:4c:98:39:db:d1:e3:aa:f3:27:83:6a:3c:
1005+ 01:ad:c5:ee:ef:01:aa:b7:4d:f7:a1:86:34:9d:61:20:7c:a0:
1006+ c0:75:26:24:6f:a3:68:0e:03:4d:cf:f3:bf:d9:40:4f:1a:04:
1007+ 4d:9c:5e:62:49:37:5b:78:ee:c5:11:78:ee:e5:87:f7:f4:f1:
1008+ 6d:0d:bd:a2:fb:a2:6c:27:91:d4:84:43:03:f5:9b:11:50:ab:
1009+ 45:ca:7c:3d:fe:5c:6b:e1:03:20:c8:c9:ac:66:ff:74:6e:0d:
1010+ 87:47:75:77:41:ca:5e:e9:77:5f:2b:09:bb:a5:7d:fc:cf:ed:
1011+ 75:dd:b0:ee:b8:da:3e:59:d0:e2:7f:38:16:fe:04:c9:99:d1:
1012+ 06:84:11:b1:07:8a:4d:59:d6:70:c3:9b:f7:f8:b9:ae:99:86:
1013+ b6:31:a4:13:de:7e:23:27:33:96:d1:9b:15:65:98:04:e5:f8:
1014+ 73:3c:f3:72:ef:a1:28:06:1d:7e:88:52:c1:f7:eb:2a:e1:f7:
1015+ 57:e5:ed:08:e9:ee:f8:95:3d:ec:4c:98:93:e7:e1:ea:a5:02:
1016+ 37:c1:66:18:ba:01:78:05:6d:c4:6b:2c:61:ee:bf:a9:e1:4d:
1017+ bf:95:31:f5:28:2a:f8:c9:ce:72:a5:c7:a3:38:2c:f6:69:34:
1018+ eb:cb:e9:b3:4f:78:de:87:61:8a:34:bd:5a:64:27:f0:42:1a:
1019+ 22:e9:2b:ac:97:f1:ed:7a:50:3b:3e:18:ae:b7:d9:20:9b:d6:
1020+ 12:3b:18:b1:47:71:39:0a:31:54:9f:fe:f2:90:d7:b8:27:6b:
1021+ 49:e5:82:cd:82:99:95:b1:ab:aa:1f:7a:e4:4e:6e:46:91:a7:
1022+ 16:b8:09:a3:5b:ec:6f:57:ca:b4:4f:69:e7:f5:f3:b9:03:93:
1023+ 08:90:9d:8d:57:82:77:bc:69:f8:e4:46:d9:4d:d1:25:ea:b8:
1024+ 60:b0:e2:cd:0c:ff:c2:63:65:20:f4:2c:34:36:34:a3:cf:67:
1025+ 6a:01:3e:51:5f:4a:49:26:9d:30:3f:03:05:70:22:b1:e3:46:
1026+ d1:ff:23:23:45:08:4b:0e:77:db:91:d9:a2:5c:15:48:49:ee:
1027+ 08:48:90:c3:25:44:b7:7b:9f:82:96:7e:8e:91:91:e5:a0:4d:
1028+ af:04:b8:72:df:07:a0:4b:02:79:0e:38:05:47:61:c3:9e:b4:
1029+ bf:01:00:10:c3:12:44:64:12:7a:bc:e1:c8:41:e5:cb:0d:7c:
1030+ 52:32:7f:71:c1:3f:6e:d3:81:d3:12:ec:85:4c:16:72:d2:79:
1031+ f8:bf:c0:fe:31:14:47:53:20:87:73:bb:34:8f:60:4a:9e:91:
1032+ 35:6e:20:96:da:bd:4b:7e:bd:c7:c4:f9:25:54:40:2c:9d:b0:
1033+ 8b:b5:fb:1e:74:59:a5:f7:b9:b7:23:56:3b:eb:2e:0a:eb:f5:
1034+ 10:9b:88:5b:49:8e:0f:05:61:7b:e5:a9:a0:24:f2:16:3f:cb:
1035+ 5b:06:d6:a5:bb:94:3a:46:2e:43:c5:02:67:b1:7d:5d:b6:c0:
1036+ f9:93:2a:d6:18:95:89:73:ff:3b:a1:f3:a6:bd:5b:6a:f0:e0:
1037+ 11:e8:95:09:83:5d:69:c3:91:e8:88:ea:b2:7c:32:73:a8:b0:
1038+ a4:24:d8:e5:6f:c7:97:8b:3e:c7:1e:69:6a:2a:b7:db:d1:26:
1039+ 7b:94:83:27:6d:d2:82:58:dd:a7:c2:74:0d:43:13:e2:c5:96:
1040+ 9f:3c:00:40:1a:10:b1:da:62:23:2e:b7:5c:33:61:56:3b:8b:
1041+ b4:b9:01:64:71:67:82:7c:18:2c:e8:d9:cf:e7:da:4b:16:7a:
1042+ 91:67:af:82:0e:ac:7a:c9:cc:47:9b:84:b9:49:e8:3d:33:a4:
1043+ 66:3f:c3:c1:20:ba:d1:0e:1e:11:80:82:78:90:25:a4:bc:80:
1044+ a2:25:8a:5c:de:3c:59:52:2f:b3:50:bb:0b:5a:f1:96:8d:d2:
1045+ eb:b9:f1:e9:72:a8:ae:f2:15:fd:5a:9c:a3:e8:ca:26:e9:67:
1046+ 80:13:38:1f:38:9f:85:8a:82:3c:4f:d3:04:ff:3a:13:f7:b5:
1047+ 13:f7:e3:50:1d:d6:e1:e6:1e:d0:b4:c8:5e:21:d7:22:cc:01:
1048+ de:db:d1:c4:a2:5c:0b:dc:dc:2f:08:e4:2e:12:c5:4a:bc:a1:
1049+ b3:92:32:1e:05:5c:7e:ca:43:6e:2e:06:3f:27:fd:1b:75:f0:
1050+ 01:42:8d:ff:aa:f8:f1:47:5b:56:67:74:66:1b:aa:b5:75:41:
1051+ 69:ba:91:66:ce:c3:3a:00:7a:93:59:1c:0c:49:c2:d2:d8:8d:
1052+ 7a:57:a4:7d:ba:61:26:1e:e9:aa:ab:e6:cb:2c:16:0a
1053 -----BEGIN CERTIFICATE-----
1054-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
1102-/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
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
1155+umEmHumqq+bLLBYK
1156 -----END CERTIFICATE-----
1157
1158=== modified file 'mysql-test/std_data/server8k-key.pem'
1159--- mysql-test/std_data/server8k-key.pem 2010-07-28 15:59:19 +0000
1160+++ mysql-test/std_data/server8k-key.pem 2015-03-20 19:14:12 +0000
1161@@ -1,99 +1,99 @@
1162 -----BEGIN RSA PRIVATE KEY-----
1163-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
1357 -----END RSA PRIVATE KEY-----
1358
1359=== modified file 'mysql-test/t/openssl_1.test'
1360--- mysql-test/t/openssl_1.test 2014-12-12 08:03:25 +0000
1361+++ mysql-test/t/openssl_1.test 2015-03-20 19:14:12 +0000
1362@@ -15,8 +15,8 @@
1363
1364 grant select on test.* to ssl_user1@localhost require SSL;
1365 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
1366-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
1367-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
1368+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
1369+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
1370 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
1371 flush privileges;
1372
1373
1374=== added file 'mysql-test/t/percona_bug1354988.test'
1375--- mysql-test/t/percona_bug1354988.test 1970-01-01 00:00:00 +0000
1376+++ mysql-test/t/percona_bug1354988.test 2015-03-20 19:14:12 +0000
1377@@ -0,0 +1,53 @@
1378+# The bug #1354988 test.
1379+
1380+CREATE USER grantee@localhost IDENTIFIED BY 'grantee1';
1381+CREATE USER grantee IDENTIFIED BY 'grantee2';
1382+
1383+CREATE DATABASE db2;
1384+
1385+
1386+CREATE DATABASE db3;
1387+USE db3;
1388+
1389+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
1390+CREATE TABLE t2 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
1391+INSERT INTO t2 (b) VALUES (1), (2);
1392+
1393+-- delimiter |
1394+
1395+CREATE FUNCTION f1() RETURNS INT
1396+BEGIN
1397+ RETURN 1;
1398+END |
1399+
1400+CREATE PROCEDURE p1()
1401+BEGIN
1402+ SELECT 1;
1403+END |
1404+
1405+-- delimiter ;
1406+
1407+GRANT ALL PRIVILEGES ON db2.* TO grantee WITH GRANT OPTION;
1408+GRANT SELECT(a) ON TABLE db3.t2 TO grantee WITH GRANT OPTION;
1409+GRANT ALL PRIVILEGES ON TABLE db3.t1 TO grantee WITH GRANT OPTION;
1410+GRANT ALL PRIVILEGES ON FUNCTION db3.f1 TO grantee WITH GRANT OPTION;
1411+GRANT ALL PRIVILEGES ON PROCEDURE db3.p1 TO grantee WITH GRANT OPTION;
1412+
1413+-- connect (con1, localhost, grantee,grantee1,)
1414+-- connection con1
1415+SELECT user(), current_user();
1416+SHOW GRANTS;
1417+USE db2;
1418+CREATE TABLE t1(f1 int);
1419+USE db3;
1420+SELECT a FROM t2;
1421+INSERT INTO t1 (b) VALUES (1), (2);
1422+SELECT f1();
1423+CALL p1();
1424+-- disconnect con1
1425+
1426+-- connection default
1427+DROP DATABASE db2;
1428+DROP DATABASE db3;
1429+DROP USER grantee@localhost;
1430+DROP USER grantee;
1431
1432=== modified file 'mysql-test/t/percona_log_slow_sp_statements.test'
1433--- mysql-test/t/percona_log_slow_sp_statements.test 2014-12-01 21:13:37 +0000
1434+++ mysql-test/t/percona_log_slow_sp_statements.test 2015-03-20 19:14:12 +0000
1435@@ -39,9 +39,9 @@
1436 --source include/log_grep.inc
1437 --let grep_pattern=CALL test_
1438 --source include/log_grep.inc
1439---let grep_pattern=# Stored routine: test.test_outer
1440+--let grep_pattern=# Stored_routine: test.test_outer
1441 --source include/log_grep.inc
1442---let grep_pattern=# Stored routine: test.test_inner
1443+--let grep_pattern=# Stored_routine: test.test_inner
1444 --source include/log_grep.inc
1445
1446 SET GLOBAL log_slow_sp_statements=OFF;
1447@@ -56,7 +56,7 @@
1448 --source include/log_grep.inc
1449 --let grep_pattern=CALL test_
1450 --source include/log_grep.inc
1451---let grep_pattern=# Stored routine: test.test_
1452+--let grep_pattern=# Stored_routine: test.test_
1453 --source include/log_grep.inc
1454
1455 DROP PROCEDURE test_outer;
1456
1457=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node1'
1458--- percona-xtradb-cluster-tests/conf/conf20.cnf-node1 2014-02-08 14:16:24 +0000
1459+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node1 2015-03-20 19:14:12 +0000
1460@@ -15,5 +15,5 @@
1461 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
1462
1463 [sst]
1464-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1465+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1466 encrypt=1
1467
1468=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node2'
1469--- percona-xtradb-cluster-tests/conf/conf20.cnf-node2 2014-02-08 14:16:24 +0000
1470+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node2 2015-03-20 19:14:12 +0000
1471@@ -15,5 +15,5 @@
1472 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
1473
1474 [sst]
1475-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1476+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1477 encrypt=1
1478
1479=== modified file 'percona-xtradb-cluster-tests/run.sh'
1480--- percona-xtradb-cluster-tests/run.sh 2014-07-02 15:50:10 +0000
1481+++ percona-xtradb-cluster-tests/run.sh 2015-03-20 19:14:12 +0000
1482@@ -956,7 +956,10 @@
1483 # Execute the test in a subshell. This is required to catch syntax
1484 # errors, as otherwise $? would be 0 in cleanup_on_test_exit resulting in
1485 # passed test
1486- (. $t) || exit $?
1487+ (. $t) || {
1488+ logs
1489+ exit $?
1490+ }
1491 ) > ${worker_outfiles[$worker]} 2>&1 &
1492
1493 worker_pids[$worker]=$!
1494
1495=== added file 'scripts/clustercheck.sh'
1496--- scripts/clustercheck.sh 1970-01-01 00:00:00 +0000
1497+++ scripts/clustercheck.sh 2015-03-20 19:14:12 +0000
1498@@ -0,0 +1,94 @@
1499+#!/bin/bash
1500+#
1501+# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
1502+#
1503+# Authors:
1504+# Raghavendra Prabhu <raghavendra.prabhu@percona.com>
1505+# Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
1506+#
1507+# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
1508+#
1509+# Grant privileges required:
1510+# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
1511+
1512+if [[ $1 == '-h' || $1 == '--help' ]];then
1513+ echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
1514+ exit
1515+fi
1516+
1517+MYSQL_USERNAME="${1-clustercheckuser}"
1518+MYSQL_PASSWORD="${2-clustercheckpassword!}"
1519+AVAILABLE_WHEN_DONOR=${3:-0}
1520+ERR_FILE="${4:-/dev/null}"
1521+AVAILABLE_WHEN_READONLY=${5:-1}
1522+DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
1523+#Timeout exists for instances where mysqld may be hung
1524+TIMEOUT=10
1525+
1526+EXTRA_ARGS=""
1527+if [[ -n "$MYSQL_USERNAME" ]]; then
1528+ EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
1529+fi
1530+if [[ -n "$MYSQL_PASSWORD" ]]; then
1531+ EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
1532+fi
1533+if [[ -r $DEFAULTS_EXTRA_FILE ]];then
1534+ MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
1535+ ${EXTRA_ARGS}"
1536+else
1537+ MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
1538+fi
1539+#
1540+# Perform the query to check the wsrep_local_state
1541+#
1542+WSREP_STATUS=($($MYSQL_CMDLINE -e "SHOW GLOBAL STATUS LIKE 'wsrep_%';" \
1543+ 2>${ERR_FILE} | grep -A 1 -E 'wsrep_local_state$|wsrep_cluster_status$' \
1544+ | sed -n -e '2p' -e '5p' | tr '\n' ' '))
1545+
1546+if [[ ${WSREP_STATUS[1]} == 'Primary' && ( ${WSREP_STATUS[0]} -eq 4 || \
1547+ ( ${WSREP_STATUS[0]} -eq 2 && $AVAILABLE_WHEN_DONOR -eq 1 ) ) ]]
1548+then
1549+
1550+ # Check only when set to 0 to avoid latency in response.
1551+ if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
1552+ READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
1553+ 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1554+
1555+ if [[ "${READ_ONLY}" == "ON" ]];then
1556+ # Percona XtraDB Cluster node local state is 'Synced', but it is in
1557+ # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
1558+ # => return HTTP 503
1559+ # Shell return-code is 1
1560+ echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1561+ echo -en "Content-Type: text/plain\r\n"
1562+ echo -en "Connection: close\r\n"
1563+ echo -en "Content-Length: 43\r\n"
1564+ echo -en "\r\n"
1565+ echo -en "Percona XtraDB Cluster Node is read-only.\r\n"
1566+ sleep 0.1
1567+ exit 1
1568+ fi
1569+
1570+ fi
1571+ # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
1572+ # Shell return-code is 0
1573+ echo -en "HTTP/1.1 200 OK\r\n"
1574+ echo -en "Content-Type: text/plain\r\n"
1575+ echo -en "Connection: close\r\n"
1576+ echo -en "Content-Length: 40\r\n"
1577+ echo -en "\r\n"
1578+ echo -en "Percona XtraDB Cluster Node is synced.\r\n"
1579+ sleep 0.1
1580+ exit 0
1581+else
1582+ # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
1583+ # Shell return-code is 1
1584+ echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1585+ echo -en "Content-Type: text/plain\r\n"
1586+ echo -en "Connection: close\r\n"
1587+ echo -en "Content-Length: 57\r\n"
1588+ echo -en "\r\n"
1589+ echo -en "Percona XtraDB Cluster Node is not synced or non-PRIM. \r\n"
1590+ sleep 0.1
1591+ exit 1
1592+fi
1593
1594=== removed file 'scripts/clustercheck.sh'
1595--- scripts/clustercheck.sh 2014-08-30 06:05:25 +0000
1596+++ scripts/clustercheck.sh 1970-01-01 00:00:00 +0000
1597@@ -1,92 +0,0 @@
1598-#!/bin/bash
1599-#
1600-# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
1601-#
1602-# Authors:
1603-# Raghavendra Prabhu <raghavendra.prabhu@percona.com>
1604-# Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
1605-#
1606-# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
1607-#
1608-# Grant privileges required:
1609-# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
1610-
1611-if [[ $1 == '-h' || $1 == '--help' ]];then
1612- echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
1613- exit
1614-fi
1615-
1616-MYSQL_USERNAME="${1-clustercheckuser}"
1617-MYSQL_PASSWORD="${2-clustercheckpassword!}"
1618-AVAILABLE_WHEN_DONOR=${3:-0}
1619-ERR_FILE="${4:-/dev/null}"
1620-AVAILABLE_WHEN_READONLY=${5:-1}
1621-DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
1622-#Timeout exists for instances where mysqld may be hung
1623-TIMEOUT=10
1624-
1625-EXTRA_ARGS=""
1626-if [[ -n "$MYSQL_USERNAME" ]]; then
1627- EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
1628-fi
1629-if [[ -n "$MYSQL_PASSWORD" ]]; then
1630- EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
1631-fi
1632-if [[ -r $DEFAULTS_EXTRA_FILE ]];then
1633- MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
1634- ${EXTRA_ARGS}"
1635-else
1636- MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
1637-fi
1638-#
1639-# Perform the query to check the wsrep_local_state
1640-#
1641-WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
1642- 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1643-
1644-if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
1645-then
1646-
1647- # Check only when set to 0 to avoid latency in response.
1648- if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
1649- READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
1650- 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1651-
1652- if [[ "${READ_ONLY}" == "ON" ]];then
1653- # Percona XtraDB Cluster node local state is 'Synced', but it is in
1654- # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
1655- # => return HTTP 503
1656- # Shell return-code is 1
1657- echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1658- echo -en "Content-Type: text/plain\r\n"
1659- echo -en "Connection: close\r\n"
1660- echo -en "Content-Length: 43\r\n"
1661- echo -en "\r\n"
1662- echo -en "Percona XtraDB Cluster Node is read-only.\r\n"
1663- sleep 0.1
1664- exit 1
1665- fi
1666-
1667- fi
1668- # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
1669- # Shell return-code is 0
1670- echo -en "HTTP/1.1 200 OK\r\n"
1671- echo -en "Content-Type: text/plain\r\n"
1672- echo -en "Connection: close\r\n"
1673- echo -en "Content-Length: 40\r\n"
1674- echo -en "\r\n"
1675- echo -en "Percona XtraDB Cluster Node is synced.\r\n"
1676- sleep 0.1
1677- exit 0
1678-else
1679- # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
1680- # Shell return-code is 1
1681- echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1682- echo -en "Content-Type: text/plain\r\n"
1683- echo -en "Connection: close\r\n"
1684- echo -en "Content-Length: 44\r\n"
1685- echo -en "\r\n"
1686- echo -en "Percona XtraDB Cluster Node is not synced.\r\n"
1687- sleep 0.1
1688- exit 1
1689-fi
1690
1691=== modified file 'scripts/mysqld_safe.sh'
1692--- scripts/mysqld_safe.sh 2014-04-20 15:59:19 +0000
1693+++ scripts/mysqld_safe.sh 2015-03-20 19:14:12 +0000
1694@@ -19,6 +19,7 @@
1695 mysqld_ld_library_path=
1696 flush_caches=0
1697 numa_interleave=0
1698+resume_on_fail=1
1699
1700 # Initial logging status: error log is not open, and not using syslog
1701 logging=init
1702@@ -252,7 +253,7 @@
1703 if [ -z "$skipped" ]; then
1704 log_error "WSREP: Failed to recover position:
1705 '`cat $wr_logfile`'"
1706- ret=1
1707+ ret=2
1708 else
1709 log_notice "WSREP: Position recovery skipped"
1710 fi
1711@@ -327,6 +328,7 @@
1712 --wsrep-data-home-dir=*) wsrep_data_home_dir="$val"; ;;
1713 --flush-caches=*) flush_caches="$val" ;;
1714 --numa-interleave=*) numa_interleave="$val" ;;
1715+ --exit-on-recover-fail) resume_on_fail=0 ;;
1716 --wsrep[-_]provider=*)
1717 if test -n "$val" && test "$val" != "none"
1718 then
1719@@ -973,8 +975,20 @@
1720 wsrep_start_position_opt="--wsrep_start_position='00000000-0000-0000-0000-000000000000:-1'"
1721 fi
1722
1723+ retcode=$?
1724
1725- [ $? -ne 0 ] && exit 1 #
1726+ if test $retcode -eq 2;then
1727+ if test $resume_on_fail -eq 1;then
1728+ log_notice "wsrep-recovery has failed to recover, continuing with startup"
1729+ wsrep_start_position_opt=""
1730+ else
1731+ log_error " --exit-on-recover-fail is provided, bailing out"
1732+ exit 2
1733+ fi
1734+ elif test $retcode -ne 0;then
1735+ log_error "Unknown error: $retcode"
1736+ exit $retcode
1737+ fi
1738
1739 [ -n "$wsrep_urls" ] && url=`wsrep_pick_url $wsrep_urls` # check connect address
1740
1741
1742=== modified file 'scripts/wsrep_sst_xtrabackup-v2.sh'
1743--- scripts/wsrep_sst_xtrabackup-v2.sh 2014-09-04 18:46:14 +0000
1744+++ scripts/wsrep_sst_xtrabackup-v2.sh 2015-03-20 19:14:12 +0000
1745@@ -29,6 +29,8 @@
1746 encrypt=0
1747 nproc=1
1748 ecode=0
1749+ssyslog=""
1750+ssystag=""
1751 XTRABACKUP_PID=""
1752 SST_PORT=""
1753 REMOTEIP=""
1754@@ -308,6 +310,15 @@
1755 iapts=$(parse_cnf sst inno-apply-opts "")
1756 impts=$(parse_cnf sst inno-move-opts "")
1757 stimeout=$(parse_cnf sst sst-initial-timeout 100)
1758+ ssyslog=$(parse_cnf sst sst-syslog 0)
1759+ ssystag=$(parse_cnf mysqld_safe syslog-tag "${SST_SYSLOG_TAG:-}")
1760+ ssystag+="-"
1761+
1762+ if [[ $ssyslog -ne -1 ]];then
1763+ if my_print_defaults -c $WSREP_SST_OPT_CONF mysqld_safe | tr '_' '-' | grep -q -- "--syslog";then
1764+ ssyslog=1
1765+ fi
1766+ fi
1767 }
1768
1769 get_stream()
1770@@ -363,6 +374,23 @@
1771 if [[ -n ${STATDIR:-} ]];then
1772 [[ -d $STATDIR ]] && rm -rf $STATDIR
1773 fi
1774+
1775+ # Final cleanup
1776+ pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
1777+
1778+ # This means no setsid done in mysqld.
1779+ # We don't want to kill mysqld here otherwise.
1780+ if [[ $$ -eq $pgid ]];then
1781+
1782+ # This means a signal was delivered to the process.
1783+ # So, more cleanup.
1784+ if [[ $estatus -ge 128 ]];then
1785+ kill -KILL -$$ || true
1786+ fi
1787+
1788+ fi
1789+
1790+ exit $estatus
1791 }
1792
1793 check_pid()
1794@@ -403,6 +431,23 @@
1795 if [[ -n $itmpdir ]];then
1796 [[ -d $itmpdir ]] && rm -rf $itmpdir || true
1797 fi
1798+
1799+ # Final cleanup
1800+ pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
1801+
1802+ # This means no setsid done in mysqld.
1803+ # We don't want to kill mysqld here otherwise.
1804+ if [[ $$ -eq $pgid ]];then
1805+
1806+ # This means a signal was delivered to the process.
1807+ # So, more cleanup.
1808+ if [[ $estatus -ge 128 ]];then
1809+ kill -KILL -$$ || true
1810+ fi
1811+
1812+ fi
1813+
1814+ exit $estatus
1815 }
1816
1817 kill_xtrabackup()
1818@@ -482,7 +527,7 @@
1819 if timeout --help | grep -q -- '-k';then
1820 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
1821 else
1822- ltcmd="timeout $tmt $tcmd"
1823+ ltcmd="timeout -s9 $tmt $tcmd"
1824 fi
1825 timeit "$msg" "$ltcmd | $strmcmd; RC=( "\${PIPESTATUS[@]}" )"
1826 else
1827@@ -551,8 +596,6 @@
1828
1829 read_cnf
1830 setup_ports
1831-get_stream
1832-get_transfer
1833
1834 if ${INNOBACKUPEX_BIN} /tmp --help | grep -q -- '--version-check'; then
1835 disver="--no-version-check"
1836@@ -560,9 +603,40 @@
1837
1838
1839 INNOEXTRA=""
1840-INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
1841-INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
1842-INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
1843+
1844+if [[ $ssyslog -eq 1 ]];then
1845+
1846+ if [[ ! -x `which logger` ]];then
1847+ wsrep_log_error "logger not in path: $PATH. Ignoring"
1848+ else
1849+
1850+ wsrep_log_info "Logging all stderr of SST/Innobackupex to syslog"
1851+
1852+ exec 2> >(logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE)
1853+
1854+ wsrep_log_error()
1855+ {
1856+ logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
1857+ }
1858+
1859+ wsrep_log_info()
1860+ {
1861+ logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
1862+ }
1863+
1864+ INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply "
1865+ INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-move "
1866+ INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2> >(logger -p daemon.err -t ${ssystag}innobackupex-backup)"
1867+ fi
1868+
1869+else
1870+ INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
1871+ INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
1872+ INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
1873+fi
1874+
1875+get_stream
1876+get_transfer
1877
1878 if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
1879 then
1880@@ -903,6 +977,9 @@
1881 fi
1882
1883 else
1884+ # || true if it has already exited
1885+ kill $jpid || true
1886+ rm -rf $DATA/.sst
1887 wsrep_log_info "${IST_FILE} received from donor: Running IST"
1888 fi
1889
1890@@ -910,6 +987,7 @@
1891 wsrep_log_error "SST magic file ${MAGIC_FILE} not found/readable"
1892 exit 2
1893 fi
1894+ wsrep_log_info "Galera co-ords from recovery: $(cat ${MAGIC_FILE})"
1895 cat "${MAGIC_FILE}" # output UUID:seqno
1896 wsrep_log_info "Total time on joiner: $totime seconds"
1897 fi
1898
1899=== modified file 'sql/log.cc'
1900--- sql/log.cc 2015-01-04 16:27:17 +0000
1901+++ sql/log.cc 2015-03-20 19:14:12 +0000
1902@@ -2930,7 +2930,7 @@
1903 if (opt_log_slow_sp_statements &&
1904 thd->spcont &&
1905 my_b_printf(&log_file,
1906- "# Stored routine: %s\n",
1907+ "# Stored_routine: %s\n",
1908 thd->spcont->sp->m_qname.str) == (uint) -1)
1909 tmp_errno= errno;
1910
1911
1912=== modified file 'sql/sql_acl.cc'
1913--- sql/sql_acl.cc 2014-08-23 07:04:19 +0000
1914+++ sql/sql_acl.cc 2015-03-20 19:14:12 +0000
1915@@ -5721,7 +5721,7 @@
1916 */
1917
1918 if (!strcmp(lex_user->user.str,user) &&
1919- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1920+ compare_hostname(&acl_db->host, lex_user->host.str, lex_user->host.str))
1921 {
1922 want_access=acl_db->access;
1923 if (want_access)
1924@@ -5791,7 +5791,9 @@
1925 */
1926
1927 if (!strcmp(lex_user->user.str,user) &&
1928- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1929+ compare_hostname(&grant_table->host,
1930+ lex_user->host.str,
1931+ lex_user->host.str))
1932 {
1933 ulong table_access= grant_table->privs;
1934 if ((table_access | grant_table->cols) != 0)
1935@@ -5940,7 +5942,9 @@
1936 */
1937
1938 if (!strcmp(lex_user->user.str,user) &&
1939- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1940+ compare_hostname(&grant_proc->host,
1941+ lex_user->host.str,
1942+ lex_user->host.str))
1943 {
1944 ulong proc_access= grant_proc->privs;
1945 if (proc_access != 0)
1946
1947=== modified file 'storage/innobase/include/univ.i'
1948--- storage/innobase/include/univ.i 2015-01-04 16:27:17 +0000
1949+++ storage/innobase/include/univ.i 2015-03-20 19:14:12 +0000
1950@@ -64,7 +64,7 @@
1951 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
1952
1953 #ifndef PERCONA_INNODB_VERSION
1954-#define PERCONA_INNODB_VERSION 36.1
1955+#define PERCONA_INNODB_VERSION 37.0
1956 #endif
1957
1958 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION
1959
1960=== modified file 'storage/innobase/lock/lock0lock.c'
1961--- storage/innobase/lock/lock0lock.c 2014-07-02 15:38:37 +0000
1962+++ storage/innobase/lock/lock0lock.c 2015-03-20 19:14:12 +0000
1963@@ -5043,7 +5043,7 @@
1964 }
1965 }
1966
1967- if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) {
1968+ if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) {
1969 nth_trx++;
1970 goto loop;
1971 }
1972
1973=== modified file 'storage/innobase/srv/srv0start.c'
1974--- storage/innobase/srv/srv0start.c 2014-04-20 15:59:19 +0000
1975+++ storage/innobase/srv/srv0start.c 2015-03-20 19:14:12 +0000
1976@@ -125,9 +125,16 @@
1977 static os_file_t files[1000];
1978
1979 /** io_handler_thread parameters for thread identification */
1980-static ulint n[SRV_MAX_N_IO_THREADS + 8];
1981-/** io_handler_thread identifiers */
1982-static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 8];
1983+static ulint n[SRV_MAX_N_IO_THREADS];
1984+/** io_handler_thread identifiers. The extra elements at the end are allocated
1985+as follows:
1986+SRV_MAX_N_IO_THREADS + 1: srv_master_thread
1987+SRV_MAX_N_IO_THREADS + 2: srv_lock_timeout_thread
1988+SRV_MAX_N_IO_THREADS + 3: srv_error_monitor_thread
1989+SRV_MAX_N_IO_THREADS + 4: srv_monitor_thread
1990+SRV_MAX_N_IO_THREADS + 5: srv_LRU_dump_restore_thread
1991+SRV_MAX_N_IO_THREADS + 6: srv_redo_log_follow_thread */
1992+static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 7];
1993
1994 /** We use this mutex to test the return value of pthread_mutex_trylock
1995 on successful locking. HP-UX does NOT return 0, though Linux et al do. */
1996@@ -1187,7 +1194,7 @@
1997 /* Create the thread that follows the redo log to output the
1998 changed page bitmap */
1999 os_thread_create(&srv_redo_log_follow_thread, NULL,
2000- thread_ids + 5 + SRV_MAX_N_IO_THREADS);
2001+ thread_ids + 6 + SRV_MAX_N_IO_THREADS);
2002 }
2003 }
2004

Subscribers

People subscribed via source and target branches

to all changes: