Merge lp:~percona-core/percona-xtradb-cluster/trunk-5541-1402338 into lp:percona-xtradb-cluster/5.5

Proposed by Raghavendra D Prabhu on 2015-03-24
Status: Merged
Approved by: Alexey Kopytov on 2015-03-25
Approved revision: 849
Merge reported by: Raghavendra D Prabhu
Merged at revision: not available
Proposed branch: lp:~percona-core/percona-xtradb-cluster/trunk-5541-1402338
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 1799 lines (+871/-374)
30 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 (+1/-0)
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/wsrep_sst_xtrabackup-v2.sh (+84/-6)
sql/log.cc (+1/-1)
sql/sql_acl.cc (+7/-3)
sql/wsrep_mysqld.cc (+45/-1)
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/trunk-5541-1402338
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2015-03-24 Approve on 2015-03-25
Review via email: mp+253916@code.launchpad.net
To post a comment you must log in.

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-24 05:28:01 +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-24 05:28:01 +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-24 05:28:01 +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-24 05:28:01 +0000
44@@ -562,6 +562,7 @@
45 ${CMAKE} ../ -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
46 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=%{_prefix} \
47 -DWITH_EMBEDDED_SERVER=OFF \
48+ -DMYSQL_MAINTAINER_MODE=OFF \
49 -DENABLE_DTRACE=OFF \
50 -DWITH_SSL=system \
51 -DWITH_ZLIB=system \
52
53=== modified file 'mysql-test/r/grant.result'
54--- mysql-test/r/grant.result 2011-03-21 14:22:13 +0000
55+++ mysql-test/r/grant.result 2015-03-24 05:28:01 +0000
56@@ -777,6 +777,7 @@
57 Grants for mysqltest1@192.%
58 GRANT USAGE ON *.* TO 'mysqltest1'@'192.%'
59 GRANT SELECT ON `mysqltest`.`t1` TO 'mysqltest1'@'192.%'
60+GRANT DELETE ON `mysqltest`.`t1` TO 'mysqltest1'@'%'
61 show grants for mysqltest1@'%';
62 Grants for mysqltest1@%
63 GRANT USAGE ON *.* TO 'mysqltest1'@'%'
64@@ -832,6 +833,7 @@
65 Grants for mysqltest_8@%
66 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
67 GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@'%'
68+GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@''
69 select * from information_schema.schema_privileges
70 where grantee like "'mysqltest_8'%";
71 GRANTEE TABLE_CATALOG TABLE_SCHEMA PRIVILEGE_TYPE IS_GRANTABLE
72@@ -871,6 +873,7 @@
73 show grants for mysqltest_8@'';
74 Grants for mysqltest_8@
75 GRANT USAGE ON *.* TO 'mysqltest_8'@''
76+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
77 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
78 show grants for mysqltest_8;
79 Grants for mysqltest_8@%
80@@ -880,11 +883,13 @@
81 show grants for mysqltest_8@'';
82 Grants for mysqltest_8@
83 GRANT USAGE ON *.* TO 'mysqltest_8'@''
84+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
85 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
86 show grants for mysqltest_8;
87 Grants for mysqltest_8@%
88 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
89 GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'
90+GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
91 select * from information_schema.column_privileges;
92 GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME PRIVILEGE_TYPE IS_GRANTABLE
93 'mysqltest_8'@'%' def test t1 a UPDATE NO
94@@ -914,6 +919,7 @@
95 show grants for mysqltest_8@'';
96 Grants for mysqltest_8@
97 GRANT USAGE ON *.* TO 'mysqltest_8'@''
98+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
99 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
100 show grants for mysqltest_8;
101 Grants for mysqltest_8@%
102@@ -923,11 +929,13 @@
103 show grants for mysqltest_8@'';
104 Grants for mysqltest_8@
105 GRANT USAGE ON *.* TO 'mysqltest_8'@''
106+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
107 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
108 show grants for mysqltest_8;
109 Grants for mysqltest_8@%
110 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
111 GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'
112+GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''
113 select * from information_schema.table_privileges;
114 GRANTEE TABLE_CATALOG TABLE_SCHEMA TABLE_NAME PRIVILEGE_TYPE IS_GRANTABLE
115 'mysqltest_8'@'%' def test t1 UPDATE NO
116@@ -960,12 +968,14 @@
117 show grants for mysqltest_8@'';
118 Grants for mysqltest_8@
119 GRANT USAGE ON *.* TO 'mysqltest_8'@''
120+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
121 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
122 GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
123 show grants for mysqltest_8;
124 Grants for mysqltest_8@%
125 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
126 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
127+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
128 select * from information_schema.user_privileges
129 where grantee like "'mysqltest_8'%";
130 GRANTEE TABLE_CATALOG PRIVILEGE_TYPE IS_GRANTABLE
131@@ -978,12 +988,15 @@
132 show grants for mysqltest_8@'';
133 Grants for mysqltest_8@
134 GRANT USAGE ON *.* TO 'mysqltest_8'@''
135+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
136 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
137 GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
138 show grants for mysqltest_8;
139 Grants for mysqltest_8@%
140 GRANT USAGE ON *.* TO 'mysqltest_8'@'%'
141 GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'
142+GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''
143+GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''
144 drop user mysqltest_8@'';
145 show grants for mysqltest_8@'';
146 ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host ''
147
148=== modified file 'mysql-test/r/grant_cache_no_prot.result'
149--- mysql-test/r/grant_cache_no_prot.result 2010-08-09 08:32:50 +0000
150+++ mysql-test/r/grant_cache_no_prot.result 2015-03-24 05:28:01 +0000
151@@ -121,6 +121,8 @@
152 show grants for current_user();
153 Grants for @localhost
154 GRANT USAGE ON *.* TO ''@'localhost'
155+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 ''@'%'
156+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 ''@'%'
157 ----- establish connection user2 (user=mysqltest_2) -----
158 select "user2";
159 user2
160
161=== modified file 'mysql-test/r/openssl_1.result'
162--- mysql-test/r/openssl_1.result 2014-12-12 08:03:25 +0000
163+++ mysql-test/r/openssl_1.result 2015-03-24 05:28:01 +0000
164@@ -3,8 +3,8 @@
165 insert into t1 values (5);
166 grant select on test.* to ssl_user1@localhost require SSL;
167 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
168-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
169-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";
170+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";
171+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";
172 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
173 flush privileges;
174 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
175
176=== added file 'mysql-test/r/percona_bug1354988.result'
177--- mysql-test/r/percona_bug1354988.result 1970-01-01 00:00:00 +0000
178+++ mysql-test/r/percona_bug1354988.result 2015-03-24 05:28:01 +0000
179@@ -0,0 +1,50 @@
180+CREATE USER grantee@localhost IDENTIFIED BY 'grantee1';
181+CREATE USER grantee IDENTIFIED BY 'grantee2';
182+CREATE DATABASE db2;
183+CREATE DATABASE db3;
184+USE db3;
185+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
186+CREATE TABLE t2 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
187+INSERT INTO t2 (b) VALUES (1), (2);
188+CREATE FUNCTION f1() RETURNS INT
189+BEGIN
190+RETURN 1;
191+END |
192+CREATE PROCEDURE p1()
193+BEGIN
194+SELECT 1;
195+END |
196+GRANT ALL PRIVILEGES ON db2.* TO grantee WITH GRANT OPTION;
197+GRANT SELECT(a) ON TABLE db3.t2 TO grantee WITH GRANT OPTION;
198+GRANT ALL PRIVILEGES ON TABLE db3.t1 TO grantee WITH GRANT OPTION;
199+GRANT ALL PRIVILEGES ON FUNCTION db3.f1 TO grantee WITH GRANT OPTION;
200+GRANT ALL PRIVILEGES ON PROCEDURE db3.p1 TO grantee WITH GRANT OPTION;
201+SELECT user(), current_user();
202+user() current_user()
203+grantee@localhost grantee@localhost
204+SHOW GRANTS;
205+Grants for grantee@localhost
206+GRANT USAGE ON *.* TO 'grantee'@'localhost' IDENTIFIED BY PASSWORD '*9823FF338D44DAF02422CF24DD1F879FB4F6B232'
207+GRANT ALL PRIVILEGES ON `db2`.* TO 'grantee'@'%' WITH GRANT OPTION
208+GRANT SELECT (a) ON `db3`.`t2` TO 'grantee'@'%' WITH GRANT OPTION
209+GRANT ALL PRIVILEGES ON `db3`.`t1` TO 'grantee'@'%' WITH GRANT OPTION
210+GRANT EXECUTE, ALTER ROUTINE ON PROCEDURE `db3`.`p1` TO 'grantee'@'%' WITH GRANT OPTION
211+GRANT EXECUTE, ALTER ROUTINE ON FUNCTION `db3`.`f1` TO 'grantee'@'%' WITH GRANT OPTION
212+USE db2;
213+CREATE TABLE t1(f1 int);
214+USE db3;
215+SELECT a FROM t2;
216+a
217+1
218+2
219+INSERT INTO t1 (b) VALUES (1), (2);
220+SELECT f1();
221+f1()
222+1
223+CALL p1();
224+1
225+1
226+DROP DATABASE db2;
227+DROP DATABASE db3;
228+DROP USER grantee@localhost;
229+DROP USER grantee;
230
231=== modified file 'mysql-test/r/percona_log_slow_sp_statements.result'
232--- mysql-test/r/percona_log_slow_sp_statements.result 2014-12-01 21:13:37 +0000
233+++ mysql-test/r/percona_log_slow_sp_statements.result 2015-03-24 05:28:01 +0000
234@@ -32,9 +32,9 @@
235 [log_grep.inc] lines: 2
236 [log_grep.inc] file: percona.slow_extended.sp1 pattern: CALL test_
237 [log_grep.inc] lines: 0
238-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_outer
239+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_outer
240 [log_grep.inc] lines: 2
241-[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored routine: test.test_inner
242+[log_grep.inc] file: percona.slow_extended.sp1 pattern: # Stored_routine: test.test_inner
243 [log_grep.inc] lines: 2
244 SET GLOBAL log_slow_sp_statements=OFF;
245 [log_start.inc] percona.slow_extended.sp2
246@@ -55,7 +55,7 @@
247 [log_grep.inc] lines: 0
248 [log_grep.inc] file: percona.slow_extended.sp2 pattern: CALL test_
249 [log_grep.inc] lines: 2
250-[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored routine: test.test_
251+[log_grep.inc] file: percona.slow_extended.sp2 pattern: # Stored_routine: test.test_
252 [log_grep.inc] lines: 0
253 DROP PROCEDURE test_outer;
254 DROP PROCEDURE test_inner;
255
256=== modified file 'mysql-test/std_data/cacert.pem'
257--- mysql-test/std_data/cacert.pem 2010-01-29 14:54:27 +0000
258+++ mysql-test/std_data/cacert.pem 2015-03-24 05:28:01 +0000
259@@ -1,17 +1,79 @@
260+Certificate:
261+ Data:
262+ Version: 3 (0x2)
263+ Serial Number: 16263805969935345171 (0xe1b4a55c3ddfa613)
264+ Signature Algorithm: sha256WithRSAEncryption
265+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
266+ Validity
267+ Not Before: Dec 5 04:48:11 2014 GMT
268+ Not After : Dec 1 04:48:11 2030 GMT
269+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
270+ Subject Public Key Info:
271+ Public Key Algorithm: rsaEncryption
272+ Public-Key: (2048 bit)
273+ Modulus:
274+ 00:b4:95:bd:24:92:73:06:22:01:13:28:0e:09:a3:
275+ 94:05:96:54:9d:dc:8f:83:39:f3:64:7a:31:70:f6:
276+ d9:c4:14:19:75:87:a6:b1:ea:52:ed:40:54:5a:f6:
277+ 9c:13:8e:d8:76:8f:5a:65:a5:20:19:19:bd:51:9d:
278+ ba:35:ce:9a:a9:58:0a:fc:11:6e:1d:cb:a8:f1:92:
279+ 79:ee:aa:fc:e3:32:5e:aa:0d:0b:23:34:95:e9:d3:
280+ 8e:3f:72:93:90:bc:2c:b0:04:75:4f:a4:4a:a0:32:
281+ db:ac:89:ac:34:9b:d0:07:e3:81:e9:ca:5b:26:f0:
282+ f5:de:fe:d5:5e:a0:54:26:dd:ec:58:07:6e:b9:e5:
283+ 97:f6:20:6d:d8:4a:c0:50:cc:81:e6:d2:3f:c7:47:
284+ 70:8b:15:89:65:71:2e:47:c3:42:76:b5:ee:16:0e:
285+ 26:97:6a:a3:1c:ad:90:53:50:b0:b1:6d:1d:b0:b8:
286+ 6d:df:3c:ee:bd:3b:87:e8:db:4d:3a:72:78:dd:db:
287+ 40:3d:c9:20:46:b8:4e:33:bb:76:b7:4f:b2:79:da:
288+ 03:cc:f9:75:c0:1d:4c:51:0a:b9:9b:25:34:50:11:
289+ 97:df:82:46:02:a9:bc:98:51:3e:c3:df:57:ad:b7:
290+ 28:be:de:65:ce:2b:f3:2c:22:f5:af:31:28:1c:ef:
291+ 10:09
292+ Exponent: 65537 (0x10001)
293+ X509v3 extensions:
294+ X509v3 Subject Key Identifier:
295+ 94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
296+ X509v3 Authority Key Identifier:
297+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
298+
299+ X509v3 Basic Constraints:
300+ CA:TRUE
301+ Signature Algorithm: sha256WithRSAEncryption
302+ 32:97:4c:af:bf:ca:e0:10:66:b7:cc:8b:0d:05:d1:d2:ca:b8:
303+ 0c:c2:78:57:1f:f6:55:9c:74:fc:bd:31:58:05:18:bc:6d:b5:
304+ 79:9a:22:8c:1f:da:33:ea:ef:db:e3:cb:46:bc:36:91:8b:d8:
305+ 36:8d:06:40:c2:e9:fe:79:1b:4a:c5:70:74:6d:9d:92:2c:90:
306+ be:3c:a7:88:03:e4:b7:ef:f4:b0:00:34:ec:8f:d1:c3:23:2b:
307+ ef:bc:ff:ab:a2:0e:bc:ba:11:a5:8e:44:80:fa:d6:f4:26:66:
308+ 84:64:2c:e3:23:62:0c:e2:ba:01:ab:5f:24:d6:9d:7e:9c:7b:
309+ f4:5d:0e:ba:64:35:6e:a5:fa:98:0c:57:f3:72:e8:3e:2e:ce:
310+ b3:f9:e3:fa:ee:aa:79:f9:06:01:19:b2:b3:28:ff:f4:d6:bb:
311+ 17:bb:a6:a0:e0:45:23:f3:61:40:31:5c:a3:ee:88:1c:00:31:
312+ 54:96:f9:71:37:b5:7f:66:6a:af:04:94:09:39:99:b3:88:86:
313+ 9e:bb:d6:36:24:24:f4:37:2c:a6:6c:0b:35:2e:bb:40:af:a7:
314+ 64:8a:7f:f2:74:e3:94:0c:32:bd:31:3d:d9:79:68:0f:1e:4b:
315+ 17:c0:4e:df:85:3c:f0:84:df:58:f1:d2:4d:2f:ad:ff:1b:d7:
316+ c8:9b:fe:dc
317 -----BEGIN CERTIFICATE-----
318-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
319-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
320-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
321-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
322-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
323-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
324-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
325-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
326-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
327-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
328-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
329-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
330-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
331-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
332-7F4WeS07J8LKardSvM0+hOA=
333+MIIDmTCCAoGgAwIBAgIJAOG0pVw936YTMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
334+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
335+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
336+MTQxMjA1MDQ0ODExWhcNMzAxMjAxMDQ0ODExWjBjMQswCQYDVQQGEwJTRTESMBAG
337+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
338+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
339+AQEFAAOCAQ8AMIIBCgKCAQEAtJW9JJJzBiIBEygOCaOUBZZUndyPgznzZHoxcPbZ
340+xBQZdYemsepS7UBUWvacE47Ydo9aZaUgGRm9UZ26Nc6aqVgK/BFuHcuo8ZJ57qr8
341+4zJeqg0LIzSV6dOOP3KTkLwssAR1T6RKoDLbrImsNJvQB+OB6cpbJvD13v7VXqBU
342+Jt3sWAduueWX9iBt2ErAUMyB5tI/x0dwixWJZXEuR8NCdrXuFg4ml2qjHK2QU1Cw
343+sW0dsLht3zzuvTuH6NtNOnJ43dtAPckgRrhOM7t2t0+yedoDzPl1wB1MUQq5myU0
344+UBGX34JGAqm8mFE+w99Xrbcovt5lzivzLCL1rzEoHO8QCQIDAQABo1AwTjAdBgNV
345+HQ4EFgQUlGWho4fPv8F0u9iEl7Zr7rKQc7IwHwYDVR0jBBgwFoAUlGWho4fPv8F0
346+u9iEl7Zr7rKQc7IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMpdM
347+r7/K4BBmt8yLDQXR0sq4DMJ4Vx/2VZx0/L0xWAUYvG21eZoijB/aM+rv2+PLRrw2
348+kYvYNo0GQMLp/nkbSsVwdG2dkiyQvjyniAPkt+/0sAA07I/RwyMr77z/q6IOvLoR
349+pY5EgPrW9CZmhGQs4yNiDOK6AatfJNadfpx79F0OumQ1bqX6mAxX83LoPi7Os/nj
350++u6qefkGARmysyj/9Na7F7umoOBFI/NhQDFco+6IHAAxVJb5cTe1f2ZqrwSUCTmZ
351+s4iGnrvWNiQk9DcspmwLNS67QK+nZIp/8nTjlAwyvTE92XloDx5LF8BO34U88ITf
352+WPHSTS+t/xvXyJv+3A==
353 -----END CERTIFICATE-----
354
355=== modified file 'mysql-test/std_data/client-cert.pem'
356--- mysql-test/std_data/client-cert.pem 2010-01-29 14:54:27 +0000
357+++ mysql-test/std_data/client-cert.pem 2015-03-24 05:28:01 +0000
358@@ -1,46 +1,82 @@
359 Certificate:
360 Data:
361- Version: 1 (0x0)
362- Serial Number: 1048577 (0x100001)
363- Signature Algorithm: md5WithRSAEncryption
364- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
365+ Version: 3 (0x2)
366+ Serial Number: 16263805969935345173 (0xe1b4a55c3ddfa615)
367+ Signature Algorithm: sha256WithRSAEncryption
368+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
369 Validity
370- Not Before: Jan 29 11:50:22 2010 GMT
371- Not After : Jan 28 11:50:22 2015 GMT
372- Subject: C=SE, ST=Uppsala, O=MySQL AB
373+ Not Before: Dec 5 04:49:23 2014 GMT
374+ Not After : Dec 1 04:49:23 2029 GMT
375+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
376 Subject Public Key Info:
377 Public Key Algorithm: rsaEncryption
378- Public-Key: (1024 bit)
379+ Public-Key: (2048 bit)
380 Modulus:
381- 00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
382- 78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
383- a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
384- 9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
385- 15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
386- 87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
387- 8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
388- a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
389- fc:3d:78:9b:49:6e:86:83:77
390+ 00:c8:d1:a1:fe:a4:8c:f3:1b:17:71:1b:74:35:11:
391+ e0:0e:6c:40:0a:fb:c0:f7:f0:eb:bb:c9:1d:a1:c7:
392+ d7:b0:8a:f6:f1:cf:fa:6b:d0:79:64:eb:bb:69:a5:
393+ 0d:80:06:df:52:14:d2:85:32:cf:bf:ce:2a:47:28:
394+ 5b:cd:0b:28:ab:bb:07:33:d5:8b:d3:b4:72:c4:a6:
395+ b5:cc:37:b9:03:a8:78:56:25:58:1f:17:30:7c:d1:
396+ 0a:bb:ec:3c:a3:03:90:97:99:92:49:ae:b3:57:96:
397+ 5c:1a:e9:e8:02:23:ae:c8:c9:05:50:63:e5:77:a1:
398+ 9a:73:06:74:0e:46:50:28:d8:c9:4f:c4:1c:37:b8:
399+ 52:18:0b:af:19:2b:d4:e5:66:74:a4:f3:f0:da:09:
400+ 30:f7:bc:0c:c9:9b:ce:57:06:04:27:e5:a1:2f:2b:
401+ a0:ba:b7:99:69:9d:46:fc:21:b6:45:81:9d:b2:3d:
402+ 2f:76:15:78:b5:33:62:ac:1e:6b:66:dd:27:61:0a:
403+ 47:02:20:2b:57:bb:32:20:dd:06:4c:76:a4:9b:72:
404+ 42:4c:9c:2c:76:72:12:1f:4b:df:1e:11:1f:a9:06:
405+ 54:dc:88:12:b0:49:d5:40:83:ef:7e:48:43:86:7a:
406+ 37:a6:c1:d7:9b:fe:08:34:98:e0:54:3c:30:4f:79:
407+ 15:29
408 Exponent: 65537 (0x10001)
409- Signature Algorithm: md5WithRSAEncryption
410- 5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
411- 34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
412- c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
413- 01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
414- 89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
415- 02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
416- 02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
417- 32:0b
418+ X509v3 extensions:
419+ X509v3 Basic Constraints:
420+ CA:FALSE
421+ Netscape Comment:
422+ OpenSSL Generated Certificate
423+ X509v3 Subject Key Identifier:
424+ 26:0C:90:BC:97:12:9E:43:BB:5E:FE:EB:A9:66:B3:C3:EE:B2:18:CB
425+ X509v3 Authority Key Identifier:
426+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
427+
428+ Signature Algorithm: sha256WithRSAEncryption
429+ 3e:3c:1f:6c:5b:83:d1:71:15:f5:45:52:fc:7f:67:bc:af:c5:
430+ 92:f5:74:78:13:43:3c:fe:b5:61:bf:00:47:43:45:a0:b9:dd:
431+ a1:10:0c:29:69:2a:6f:7d:67:3d:1e:09:b5:15:74:bf:73:11:
432+ e6:e9:09:b6:6b:b5:cc:1e:06:fd:bd:3a:11:d3:44:bd:ca:7a:
433+ a1:f1:09:43:fc:bf:83:89:3a:b1:18:40:f3:cf:6d:12:ef:6e:
434+ 0c:b7:a4:99:03:8a:4f:0c:3c:2c:23:78:35:2a:99:ea:de:9c:
435+ 1b:e8:8d:19:fb:44:80:13:89:81:c5:05:4b:a7:66:6b:c0:31:
436+ 41:f0:6c:60:aa:ec:d3:4c:ff:c1:3b:d5:bb:0d:42:7d:37:5e:
437+ 80:e7:9c:7e:60:90:0f:a4:4e:70:20:9c:b1:e4:1b:70:65:b0:
438+ ef:bb:41:16:ed:ad:46:ce:34:d3:02:3d:dd:e2:50:fa:3c:5d:
439+ f0:e2:71:f8:9a:ef:a3:32:25:c5:8e:64:f4:46:e1:f4:c0:69:
440+ d2:34:56:8d:d9:c2:6e:b6:55:3b:6a:4d:b6:d2:84:ab:85:7b:
441+ cb:fd:b4:73:40:ba:5d:49:e2:0d:39:77:17:01:49:bb:72:8b:
442+ 3a:c9:b1:e2:cd:13:d2:9c:ce:7d:6c:a8:f0:32:c9:a4:af:56:
443+ 6f:8a:e6:88
444 -----BEGIN CERTIFICATE-----
445-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
446-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
447-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
448-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
449-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
450-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
451-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
452-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
453-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
454-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
455-RrLFnG84kYo1Mgs=
456+MIIDyDCCArCgAwIBAgIJAOG0pVw936YVMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
457+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
458+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
459+MTQxMjA1MDQ0OTIzWhcNMjkxMjAxMDQ0OTIzWjBnMQswCQYDVQQGEwJTRTESMBAG
460+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
461+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBkNsaWVudDCCASIwDQYJKoZI
462+hvcNAQEBBQADggEPADCCAQoCggEBAMjRof6kjPMbF3EbdDUR4A5sQAr7wPfw67vJ
463+HaHH17CK9vHP+mvQeWTru2mlDYAG31IU0oUyz7/OKkcoW80LKKu7BzPVi9O0csSm
464+tcw3uQOoeFYlWB8XMHzRCrvsPKMDkJeZkkmus1eWXBrp6AIjrsjJBVBj5XehmnMG
465+dA5GUCjYyU/EHDe4UhgLrxkr1OVmdKTz8NoJMPe8DMmbzlcGBCfloS8roLq3mWmd
466+RvwhtkWBnbI9L3YVeLUzYqwea2bdJ2EKRwIgK1e7MiDdBkx2pJtyQkycLHZyEh9L
467+3x4RH6kGVNyIErBJ1UCD735IQ4Z6N6bB15v+CDSY4FQ8ME95FSkCAwEAAaN7MHkw
468+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
469+dGlmaWNhdGUwHQYDVR0OBBYEFCYMkLyXEp5Du17+66lms8PushjLMB8GA1UdIwQY
470+MBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQA+PB9s
471+W4PRcRX1RVL8f2e8r8WS9XR4E0M8/rVhvwBHQ0Wgud2hEAwpaSpvfWc9Hgm1FXS/
472+cxHm6Qm2a7XMHgb9vToR00S9ynqh8QlD/L+DiTqxGEDzz20S724Mt6SZA4pPDDws
473+I3g1Kpnq3pwb6I0Z+0SAE4mBxQVLp2ZrwDFB8GxgquzTTP/BO9W7DUJ9N16A55x+
474+YJAPpE5wIJyx5BtwZbDvu0EW7a1GzjTTAj3d4lD6PF3w4nH4mu+jMiXFjmT0RuH0
475+wGnSNFaN2cJutlU7ak220oSrhXvL/bRzQLpdSeINOXcXAUm7cos6ybHizRPSnM59
476+bKjwMsmkr1ZviuaI
477 -----END CERTIFICATE-----
478
479=== modified file 'mysql-test/std_data/client-key.pem'
480--- mysql-test/std_data/client-key.pem 2010-01-29 14:54:27 +0000
481+++ mysql-test/std_data/client-key.pem 2015-03-24 05:28:01 +0000
482@@ -1,15 +1,27 @@
483 -----BEGIN RSA PRIVATE KEY-----
484-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
522 -----END RSA PRIVATE KEY-----
523
524=== modified file 'mysql-test/std_data/server-cert.pem'
525--- mysql-test/std_data/server-cert.pem 2010-01-29 14:54:27 +0000
526+++ mysql-test/std_data/server-cert.pem 2015-03-24 05:28:01 +0000
527@@ -1,41 +1,82 @@
528 Certificate:
529 Data:
530- Version: 1 (0x0)
531- Serial Number: 1048578 (0x100002)
532- Signature Algorithm: md5WithRSAEncryption
533- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
534+ Version: 3 (0x2)
535+ Serial Number: 16263805969935345172 (0xe1b4a55c3ddfa614)
536+ Signature Algorithm: sha256WithRSAEncryption
537+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
538 Validity
539- Not Before: Jan 29 11:56:49 2010 GMT
540- Not After : Jan 28 11:56:49 2015 GMT
541- Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
542+ Not Before: Dec 5 04:48:40 2014 GMT
543+ Not After : Dec 1 04:48:40 2029 GMT
544+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=localhost
545 Subject Public Key Info:
546 Public Key Algorithm: rsaEncryption
547- Public-Key: (512 bit)
548+ Public-Key: (2048 bit)
549 Modulus:
550- 00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
551- 1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
552- c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
553- 5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
554- d8:88:2b:c2:ed
555+ 00:e9:20:e7:05:51:07:3a:48:b9:e2:62:a2:24:45:
556+ 1f:f1:54:34:22:5c:62:86:9b:01:e8:c2:45:90:00:
557+ 8d:4e:e4:a2:ea:e9:d7:b5:95:25:ce:18:ac:1a:4f:
558+ b3:e6:30:46:af:20:13:40:84:df:21:dc:df:09:e5:
559+ a0:7f:81:12:6e:1e:84:58:5c:a1:11:db:aa:b6:04:
560+ e0:fc:1e:0c:11:2e:f3:30:62:1a:f9:ee:df:fe:a3:
561+ d3:d6:83:6e:ad:e8:8d:98:89:b1:69:63:b8:72:f4:
562+ 5a:e6:22:5e:73:64:95:ef:56:92:92:0b:e1:93:a5:
563+ d7:4c:41:47:e7:31:ed:09:68:b3:c5:6e:c1:1b:01:
564+ 39:bb:f1:8f:bf:ba:f4:02:e2:e5:e5:9e:b7:d6:9a:
565+ b2:94:76:9b:48:d8:27:18:0e:9f:30:98:f5:9a:3e:
566+ 23:e6:3b:4a:48:ee:a5:26:e8:80:94:37:e4:4a:ba:
567+ ff:9f:42:b9:32:dd:7a:9d:63:11:a8:25:99:b1:1f:
568+ 86:e5:7c:b1:31:e3:12:11:0c:eb:f6:1d:02:4b:1d:
569+ 34:cb:74:1d:7f:2f:40:c0:81:e2:04:d4:8e:ea:96:
570+ f8:22:35:8e:ab:b6:99:33:36:ef:b5:83:11:88:6d:
571+ 06:0f:76:4d:bf:db:a8:df:6c:3c:91:e2:ba:73:a0:
572+ 73:45
573 Exponent: 65537 (0x10001)
574- Signature Algorithm: md5WithRSAEncryption
575- 73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
576- d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
577- a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
578- 6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
579- c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
580- f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
581- ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
582- fb:3c
583+ X509v3 extensions:
584+ X509v3 Basic Constraints:
585+ CA:FALSE
586+ Netscape Comment:
587+ OpenSSL Generated Certificate
588+ X509v3 Subject Key Identifier:
589+ E4:31:D8:D5:06:EA:C6:B3:A2:F6:01:39:8F:58:08:36:2C:7B:3F:DB
590+ X509v3 Authority Key Identifier:
591+ keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
592+
593+ Signature Algorithm: sha256WithRSAEncryption
594+ 46:ef:cd:bf:c1:ef:36:a9:cb:99:b5:be:e2:a7:ba:69:0d:f5:
595+ 9b:63:39:78:32:35:01:a8:b9:f1:70:0e:b5:d1:8f:94:2e:7a:
596+ cb:65:d4:d0:b4:ad:52:b8:51:5f:64:2e:a8:08:a5:71:fe:c2:
597+ 35:8a:0d:28:26:e5:be:ca:d7:f4:79:54:e1:27:8f:87:92:d3:
598+ 04:72:1b:cc:c4:7f:8b:26:09:92:2d:c8:6f:27:da:97:31:80:
599+ 0f:83:84:9c:e0:a4:88:c9:e3:8f:35:e7:de:bd:31:e2:fa:52:
600+ 83:de:ee:5c:60:6e:8f:a5:8d:5e:53:41:18:42:f3:03:0b:05:
601+ 0b:59:09:42:2e:1b:0b:29:b3:fe:11:3b:d5:ad:3f:4d:24:e8:
602+ c0:da:4c:0d:93:94:ec:cd:18:0f:66:cd:03:d3:ee:a0:b2:7f:
603+ 64:d7:39:66:19:72:9f:64:43:38:b4:b6:b3:ea:6f:39:e7:09:
604+ 98:90:9f:6c:f5:e8:b3:2e:09:8d:7b:76:65:30:f4:c4:9b:8e:
605+ 10:4e:9b:8c:93:63:44:9d:2b:8a:f3:f0:cf:f8:7b:65:95:38:
606+ fb:b4:92:e8:6c:11:03:a2:a2:2f:ea:e0:22:b7:cd:cf:0d:a5:
607+ 91:23:14:47:0c:34:8f:f1:11:cc:e8:1e:37:53:ec:a1:01:81:
608+ 20:c0:2c:f5
609 -----BEGIN CERTIFICATE-----
610-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
611-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
612-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
613-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
614-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
615-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
616-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
617-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
618-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
619-UYHigzBuPTib+zw=
620+MIIDyzCCArOgAwIBAgIJAOG0pVw936YUMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
621+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
622+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
623+MTQxMjA1MDQ0ODQwWhcNMjkxMjAxMDQ0ODQwWjBqMQswCQYDVQQGEwJTRTESMBAG
624+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
625+YWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJ
626+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkg5wVRBzpIueJioiRFH/FUNCJcYoab
627+AejCRZAAjU7kourp17WVJc4YrBpPs+YwRq8gE0CE3yHc3wnloH+BEm4ehFhcoRHb
628+qrYE4PweDBEu8zBiGvnu3/6j09aDbq3ojZiJsWljuHL0WuYiXnNkle9WkpIL4ZOl
629+10xBR+cx7Qlos8VuwRsBObvxj7+69ALi5eWet9aaspR2m0jYJxgOnzCY9Zo+I+Y7
630+SkjupSbogJQ35Eq6/59CuTLdep1jEaglmbEfhuV8sTHjEhEM6/YdAksdNMt0HX8v
631+QMCB4gTUjuqW+CI1jqu2mTM277WDEYhtBg92Tb/bqN9sPJHiunOgc0UCAwEAAaN7
632+MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
633+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFOQx2NUG6sazovYBOY9YCDYsez/bMB8GA1Ud
634+IwQYMBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQBG
635+782/we82qcuZtb7ip7ppDfWbYzl4MjUBqLnxcA610Y+ULnrLZdTQtK1SuFFfZC6o
636+CKVx/sI1ig0oJuW+ytf0eVThJ4+HktMEchvMxH+LJgmSLchvJ9qXMYAPg4Sc4KSI
637+yeOPNefevTHi+lKD3u5cYG6PpY1eU0EYQvMDCwULWQlCLhsLKbP+ETvVrT9NJOjA
638+2kwNk5TszRgPZs0D0+6gsn9k1zlmGXKfZEM4tLaz6m855wmYkJ9s9eizLgmNe3Zl
639+MPTEm44QTpuMk2NEnSuK8/DP+HtllTj7tJLobBEDoqIv6uAit83PDaWRIxRHDDSP
640+8RHM6B43U+yhAYEgwCz1
641 -----END CERTIFICATE-----
642
643=== modified file 'mysql-test/std_data/server-key.pem'
644--- mysql-test/std_data/server-key.pem 2010-01-29 14:54:27 +0000
645+++ mysql-test/std_data/server-key.pem 2015-03-24 05:28:01 +0000
646@@ -1,9 +1,27 @@
647 -----BEGIN RSA PRIVATE KEY-----
648-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
680 -----END RSA PRIVATE KEY-----
681
682=== modified file 'mysql-test/std_data/server8k-cert.pem'
683--- mysql-test/std_data/server8k-cert.pem 2010-07-28 15:59:19 +0000
684+++ mysql-test/std_data/server8k-cert.pem 2015-03-24 05:28:01 +0000
685@@ -1,51 +1,207 @@
686+Certificate:
687+ Data:
688+ Version: 3 (0x2)
689+ Serial Number: 10754692786786449447 (0x9540581bd8dcb827)
690+ Signature Algorithm: sha256WithRSAEncryption
691+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
692+ Validity
693+ Not Before: Dec 5 04:50:48 2014 GMT
694+ Not After : Dec 1 04:50:48 2029 GMT
695+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Server
696+ Subject Public Key Info:
697+ Public Key Algorithm: rsaEncryption
698+ Public-Key: (8192 bit)
699+ Modulus:
700+ 00:d8:8f:9d:66:66:9c:12:ca:0a:ad:9e:9f:05:66:
701+ 6c:6c:8a:db:19:9f:a2:d0:fa:38:dc:de:c5:a6:94:
702+ 60:0d:4b:72:c9:85:e2:ff:27:c8:d4:ce:b1:29:66:
703+ 31:e7:2b:4e:08:b3:a2:71:cf:1e:36:7c:8e:4d:08:
704+ 6e:fd:7a:ea:c1:0d:5c:97:09:66:fa:ed:0b:36:64:
705+ 8f:cc:39:35:a9:43:6c:a9:17:48:0f:2e:0a:4b:d3:
706+ 94:bb:b0:5b:43:f1:4e:f7:e5:30:e1:ae:a2:a8:5d:
707+ 3c:db:39:df:d6:4b:70:a6:c9:68:c3:f3:9d:19:d7:
708+ 2f:2a:38:31:11:ab:f1:60:66:c3:38:4f:d9:6f:b5:
709+ 49:df:ce:14:b5:fa:c8:95:04:50:69:90:9d:26:c2:
710+ e9:07:69:7b:a2:d8:91:e7:cd:de:c4:ed:9c:e4:c8:
711+ 8c:e3:a0:cd:dd:2b:37:21:8f:ee:54:38:91:2b:2b:
712+ 01:86:90:f0:2e:9a:06:8a:e1:f2:a2:3f:d1:d4:21:
713+ 9f:b0:81:eb:d0:e9:d3:e9:a9:28:6e:c2:06:4b:94:
714+ 6e:96:70:f5:31:33:dd:97:2f:cc:5d:80:c5:74:ce:
715+ c0:3d:b2:6a:81:b7:ce:65:4f:6a:49:3e:c9:5d:00:
716+ 3c:06:4a:57:c9:a7:f9:bb:46:50:df:64:dc:13:1f:
717+ 22:ad:21:0b:aa:4b:5d:94:60:9f:20:ff:28:aa:56:
718+ 5f:f6:cd:23:34:fe:44:a2:d6:80:bd:a9:67:00:d6:
719+ a1:82:82:9f:c9:e8:0c:97:26:1e:a9:b1:e2:ee:01:
720+ ef:9d:c6:82:fc:72:33:02:40:35:cc:ae:51:23:f4:
721+ f8:92:29:d3:2f:5c:1f:03:c6:81:7d:fb:4f:e9:de:
722+ ed:68:3c:a1:be:7c:fa:11:96:2b:5a:10:c5:c5:cb:
723+ 2e:7a:54:4c:7b:12:b8:07:01:d9:b5:38:0f:a6:43:
724+ 70:28:81:8d:d7:95:ad:d6:e8:88:b4:19:62:05:7b:
725+ 75:c0:2d:24:72:1c:4d:04:a3:f7:1d:6b:8b:fa:16:
726+ a3:5a:6c:51:ba:5c:62:fa:3e:82:7f:4e:10:db:d0:
727+ 52:d4:81:df:0e:5b:33:7e:20:77:1d:51:ca:4e:13:
728+ ee:cd:72:36:28:b4:31:88:3d:61:0f:1a:80:19:f6:
729+ 7d:71:5d:21:1f:dd:0b:d9:73:88:a9:72:4b:8d:a3:
730+ d6:f1:4f:5d:01:6e:9e:c2:28:97:80:de:5b:2d:ac:
731+ a3:c9:24:db:e9:0f:2b:36:ee:a7:f2:94:c1:41:7a:
732+ 70:9f:fd:d0:31:a9:de:55:38:65:89:20:f4:02:f1:
733+ 83:73:40:77:db:35:d2:66:ff:26:5f:f4:d2:e6:f9:
734+ ba:fc:6a:66:b1:02:24:04:a3:32:4b:21:85:83:b4:
735+ 6a:97:3c:25:7f:65:cc:a6:dd:cc:ac:e5:22:09:58:
736+ dc:a1:0d:7d:b4:ac:98:98:81:1d:a7:83:d4:3a:e4:
737+ 39:a7:04:6a:b6:b7:5d:a8:fe:0e:47:08:1d:95:61:
738+ eb:a8:97:53:91:1e:ca:1f:3f:19:5a:01:73:da:33:
739+ 32:d7:33:ca:39:1e:00:37:6b:f8:18:47:30:3a:2e:
740+ 99:39:d0:d0:49:6d:87:c1:98:59:d0:21:ca:12:6d:
741+ 89:33:0f:f2:52:6e:d6:c5:78:dd:15:b6:11:d6:5e:
742+ 72:e8:c7:12:00:c3:8d:57:34:e5:d8:6d:a2:e8:47:
743+ 79:83:8c:49:17:3b:75:24:0d:de:e1:3b:dd:bc:b7:
744+ df:89:a6:31:e6:49:37:80:f8:8f:86:e3:42:f4:2e:
745+ dc:de:58:45:c4:41:a9:2d:a6:5d:f0:7d:81:3d:54:
746+ f4:8a:a3:5f:18:7c:02:c9:7f:1c:f5:9f:dd:0a:29:
747+ 49:40:92:24:b3:b7:65:37:91:9a:a8:00:c4:4e:7f:
748+ 7e:f7:97:de:24:2a:d7:3b:f2:a2:63:ec:38:b7:1f:
749+ 9e:b5:72:99:bd:b1:c0:41:6a:57:97:e2:fb:11:32:
750+ ba:a3:5d:82:48:c5:0a:cc:2c:f5:21:7a:f1:99:56:
751+ 1b:54:9d:c7:64:50:62:80:94:50:5a:40:32:61:f3:
752+ 2c:f8:09:dc:f0:6d:2b:60:29:c2:86:70:5a:57:12:
753+ 7d:09:73:ca:41:6d:22:61:18:1a:48:cb:80:95:be:
754+ 08:e8:15:99:de:36:3a:bf:09:67:35:e8:53:d9:40:
755+ 1b:27:e5:14:32:09:73:e0:f6:a9:19:ee:81:90:dc:
756+ b7:9d:b6:91:51:33:1e:1f:22:e0:bd:df:a8:d1:33:
757+ a7:ab:9b:9c:27:7a:3c:ef:aa:9e:4d:f8:a8:97:63:
758+ 24:20:c8:36:ab:05:8a:c0:80:9b:64:0c:1f:ec:4f:
759+ de:ec:f0:9c:9c:54:db:02:ab:12:aa:ab:58:a3:49:
760+ 25:bf:6a:0a:04:7f:2f:1d:41:11:23:4e:e2:83:51:
761+ e3:f5:12:95:22:72:13:f4:be:6f:e2:00:29:4f:fe:
762+ 9b:ae:b9:e2:7d:72:d3:1b:e8:12:3b:6d:b6:d2:62:
763+ a4:91:31:46:e7:16:7f:9d:8d:74:5e:97:51:d1:cb:
764+ 82:57:bb:bd:46:e4:9c:c5:bd:08:8b:68:20:f8:5e:
765+ d6:aa:ed:6e:4d:ba:a4:29:fd:ac:5c:2f:25:14:d3:
766+ 19:63:0c:01:75:6c:87:a5:0b:29:09:7f:13:7f:00:
767+ d4:63:72:e2:a0:39:88:80:68:2c:3f:49:b1:9b:94:
768+ 77:63:08:05:55
769+ Exponent: 65537 (0x10001)
770+ X509v3 extensions:
771+ X509v3 Basic Constraints:
772+ CA:FALSE
773+ Netscape Comment:
774+ OpenSSL Generated Certificate
775+ X509v3 Subject Key Identifier:
776+ 3E:96:BB:23:C2:FD:41:11:7F:EB:63:9B:39:5F:58:2D:92:A0:F0:9F
777+ X509v3 Authority Key Identifier:
778+ keyid:60:57:8F:09:CF:83:86:4B:35:32:BF:73:EB:81:4C:DB:36:27:12:8F
779+
780+ Signature Algorithm: sha256WithRSAEncryption
781+ 19:b8:4d:94:a3:41:1b:78:e8:fa:da:7c:c3:0c:f5:42:6a:2e:
782+ 04:8c:f4:6e:90:e0:d1:55:28:7c:97:85:18:12:c4:ff:d3:ba:
783+ 74:f1:7f:af:b0:ab:4d:64:f4:45:58:6e:b1:2e:06:cc:a7:5b:
784+ cd:25:8f:60:68:14:e1:f9:56:21:40:43:e4:c4:ee:91:72:01:
785+ 7d:86:41:2f:ac:6d:be:c6:1a:2a:ae:dd:13:ca:51:01:37:33:
786+ 7e:b9:1a:9a:28:16:8c:bc:d1:e7:d4:46:55:87:1f:05:93:4c:
787+ b5:75:ff:ed:ca:29:b2:5d:15:05:4c:02:a9:53:3c:d9:11:01:
788+ 04:db:82:ad:01:ad:4e:d4:7d:9e:6a:00:5e:cc:88:83:42:98:
789+ 6e:4b:cd:7c:55:c6:4c:98:39:db:d1:e3:aa:f3:27:83:6a:3c:
790+ 01:ad:c5:ee:ef:01:aa:b7:4d:f7:a1:86:34:9d:61:20:7c:a0:
791+ c0:75:26:24:6f:a3:68:0e:03:4d:cf:f3:bf:d9:40:4f:1a:04:
792+ 4d:9c:5e:62:49:37:5b:78:ee:c5:11:78:ee:e5:87:f7:f4:f1:
793+ 6d:0d:bd:a2:fb:a2:6c:27:91:d4:84:43:03:f5:9b:11:50:ab:
794+ 45:ca:7c:3d:fe:5c:6b:e1:03:20:c8:c9:ac:66:ff:74:6e:0d:
795+ 87:47:75:77:41:ca:5e:e9:77:5f:2b:09:bb:a5:7d:fc:cf:ed:
796+ 75:dd:b0:ee:b8:da:3e:59:d0:e2:7f:38:16:fe:04:c9:99:d1:
797+ 06:84:11:b1:07:8a:4d:59:d6:70:c3:9b:f7:f8:b9:ae:99:86:
798+ b6:31:a4:13:de:7e:23:27:33:96:d1:9b:15:65:98:04:e5:f8:
799+ 73:3c:f3:72:ef:a1:28:06:1d:7e:88:52:c1:f7:eb:2a:e1:f7:
800+ 57:e5:ed:08:e9:ee:f8:95:3d:ec:4c:98:93:e7:e1:ea:a5:02:
801+ 37:c1:66:18:ba:01:78:05:6d:c4:6b:2c:61:ee:bf:a9:e1:4d:
802+ bf:95:31:f5:28:2a:f8:c9:ce:72:a5:c7:a3:38:2c:f6:69:34:
803+ eb:cb:e9:b3:4f:78:de:87:61:8a:34:bd:5a:64:27:f0:42:1a:
804+ 22:e9:2b:ac:97:f1:ed:7a:50:3b:3e:18:ae:b7:d9:20:9b:d6:
805+ 12:3b:18:b1:47:71:39:0a:31:54:9f:fe:f2:90:d7:b8:27:6b:
806+ 49:e5:82:cd:82:99:95:b1:ab:aa:1f:7a:e4:4e:6e:46:91:a7:
807+ 16:b8:09:a3:5b:ec:6f:57:ca:b4:4f:69:e7:f5:f3:b9:03:93:
808+ 08:90:9d:8d:57:82:77:bc:69:f8:e4:46:d9:4d:d1:25:ea:b8:
809+ 60:b0:e2:cd:0c:ff:c2:63:65:20:f4:2c:34:36:34:a3:cf:67:
810+ 6a:01:3e:51:5f:4a:49:26:9d:30:3f:03:05:70:22:b1:e3:46:
811+ d1:ff:23:23:45:08:4b:0e:77:db:91:d9:a2:5c:15:48:49:ee:
812+ 08:48:90:c3:25:44:b7:7b:9f:82:96:7e:8e:91:91:e5:a0:4d:
813+ af:04:b8:72:df:07:a0:4b:02:79:0e:38:05:47:61:c3:9e:b4:
814+ bf:01:00:10:c3:12:44:64:12:7a:bc:e1:c8:41:e5:cb:0d:7c:
815+ 52:32:7f:71:c1:3f:6e:d3:81:d3:12:ec:85:4c:16:72:d2:79:
816+ f8:bf:c0:fe:31:14:47:53:20:87:73:bb:34:8f:60:4a:9e:91:
817+ 35:6e:20:96:da:bd:4b:7e:bd:c7:c4:f9:25:54:40:2c:9d:b0:
818+ 8b:b5:fb:1e:74:59:a5:f7:b9:b7:23:56:3b:eb:2e:0a:eb:f5:
819+ 10:9b:88:5b:49:8e:0f:05:61:7b:e5:a9:a0:24:f2:16:3f:cb:
820+ 5b:06:d6:a5:bb:94:3a:46:2e:43:c5:02:67:b1:7d:5d:b6:c0:
821+ f9:93:2a:d6:18:95:89:73:ff:3b:a1:f3:a6:bd:5b:6a:f0:e0:
822+ 11:e8:95:09:83:5d:69:c3:91:e8:88:ea:b2:7c:32:73:a8:b0:
823+ a4:24:d8:e5:6f:c7:97:8b:3e:c7:1e:69:6a:2a:b7:db:d1:26:
824+ 7b:94:83:27:6d:d2:82:58:dd:a7:c2:74:0d:43:13:e2:c5:96:
825+ 9f:3c:00:40:1a:10:b1:da:62:23:2e:b7:5c:33:61:56:3b:8b:
826+ b4:b9:01:64:71:67:82:7c:18:2c:e8:d9:cf:e7:da:4b:16:7a:
827+ 91:67:af:82:0e:ac:7a:c9:cc:47:9b:84:b9:49:e8:3d:33:a4:
828+ 66:3f:c3:c1:20:ba:d1:0e:1e:11:80:82:78:90:25:a4:bc:80:
829+ a2:25:8a:5c:de:3c:59:52:2f:b3:50:bb:0b:5a:f1:96:8d:d2:
830+ eb:b9:f1:e9:72:a8:ae:f2:15:fd:5a:9c:a3:e8:ca:26:e9:67:
831+ 80:13:38:1f:38:9f:85:8a:82:3c:4f:d3:04:ff:3a:13:f7:b5:
832+ 13:f7:e3:50:1d:d6:e1:e6:1e:d0:b4:c8:5e:21:d7:22:cc:01:
833+ de:db:d1:c4:a2:5c:0b:dc:dc:2f:08:e4:2e:12:c5:4a:bc:a1:
834+ b3:92:32:1e:05:5c:7e:ca:43:6e:2e:06:3f:27:fd:1b:75:f0:
835+ 01:42:8d:ff:aa:f8:f1:47:5b:56:67:74:66:1b:aa:b5:75:41:
836+ 69:ba:91:66:ce:c3:3a:00:7a:93:59:1c:0c:49:c2:d2:d8:8d:
837+ 7a:57:a4:7d:ba:61:26:1e:e9:aa:ab:e6:cb:2c:16:0a
838 -----BEGIN CERTIFICATE-----
839-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
887-/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
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
940+umEmHumqq+bLLBYK
941 -----END CERTIFICATE-----
942
943=== modified file 'mysql-test/std_data/server8k-key.pem'
944--- mysql-test/std_data/server8k-key.pem 2010-07-28 15:59:19 +0000
945+++ mysql-test/std_data/server8k-key.pem 2015-03-24 05:28:01 +0000
946@@ -1,99 +1,99 @@
947 -----BEGIN RSA PRIVATE KEY-----
948-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
1142 -----END RSA PRIVATE KEY-----
1143
1144=== modified file 'mysql-test/t/openssl_1.test'
1145--- mysql-test/t/openssl_1.test 2014-12-12 08:03:25 +0000
1146+++ mysql-test/t/openssl_1.test 2015-03-24 05:28:01 +0000
1147@@ -15,8 +15,8 @@
1148
1149 grant select on test.* to ssl_user1@localhost require SSL;
1150 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
1151-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
1152-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";
1153+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";
1154+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";
1155 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
1156 flush privileges;
1157
1158
1159=== added file 'mysql-test/t/percona_bug1354988.test'
1160--- mysql-test/t/percona_bug1354988.test 1970-01-01 00:00:00 +0000
1161+++ mysql-test/t/percona_bug1354988.test 2015-03-24 05:28:01 +0000
1162@@ -0,0 +1,53 @@
1163+# The bug #1354988 test.
1164+
1165+CREATE USER grantee@localhost IDENTIFIED BY 'grantee1';
1166+CREATE USER grantee IDENTIFIED BY 'grantee2';
1167+
1168+CREATE DATABASE db2;
1169+
1170+
1171+CREATE DATABASE db3;
1172+USE db3;
1173+
1174+CREATE TABLE t1 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
1175+CREATE TABLE t2 (a INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, b INT(10) UNSIGNED NOT NULL DEFAULT 0);
1176+INSERT INTO t2 (b) VALUES (1), (2);
1177+
1178+-- delimiter |
1179+
1180+CREATE FUNCTION f1() RETURNS INT
1181+BEGIN
1182+ RETURN 1;
1183+END |
1184+
1185+CREATE PROCEDURE p1()
1186+BEGIN
1187+ SELECT 1;
1188+END |
1189+
1190+-- delimiter ;
1191+
1192+GRANT ALL PRIVILEGES ON db2.* TO grantee WITH GRANT OPTION;
1193+GRANT SELECT(a) ON TABLE db3.t2 TO grantee WITH GRANT OPTION;
1194+GRANT ALL PRIVILEGES ON TABLE db3.t1 TO grantee WITH GRANT OPTION;
1195+GRANT ALL PRIVILEGES ON FUNCTION db3.f1 TO grantee WITH GRANT OPTION;
1196+GRANT ALL PRIVILEGES ON PROCEDURE db3.p1 TO grantee WITH GRANT OPTION;
1197+
1198+-- connect (con1, localhost, grantee,grantee1,)
1199+-- connection con1
1200+SELECT user(), current_user();
1201+SHOW GRANTS;
1202+USE db2;
1203+CREATE TABLE t1(f1 int);
1204+USE db3;
1205+SELECT a FROM t2;
1206+INSERT INTO t1 (b) VALUES (1), (2);
1207+SELECT f1();
1208+CALL p1();
1209+-- disconnect con1
1210+
1211+-- connection default
1212+DROP DATABASE db2;
1213+DROP DATABASE db3;
1214+DROP USER grantee@localhost;
1215+DROP USER grantee;
1216
1217=== modified file 'mysql-test/t/percona_log_slow_sp_statements.test'
1218--- mysql-test/t/percona_log_slow_sp_statements.test 2014-12-01 21:13:37 +0000
1219+++ mysql-test/t/percona_log_slow_sp_statements.test 2015-03-24 05:28:01 +0000
1220@@ -39,9 +39,9 @@
1221 --source include/log_grep.inc
1222 --let grep_pattern=CALL test_
1223 --source include/log_grep.inc
1224---let grep_pattern=# Stored routine: test.test_outer
1225+--let grep_pattern=# Stored_routine: test.test_outer
1226 --source include/log_grep.inc
1227---let grep_pattern=# Stored routine: test.test_inner
1228+--let grep_pattern=# Stored_routine: test.test_inner
1229 --source include/log_grep.inc
1230
1231 SET GLOBAL log_slow_sp_statements=OFF;
1232@@ -56,7 +56,7 @@
1233 --source include/log_grep.inc
1234 --let grep_pattern=CALL test_
1235 --source include/log_grep.inc
1236---let grep_pattern=# Stored routine: test.test_
1237+--let grep_pattern=# Stored_routine: test.test_
1238 --source include/log_grep.inc
1239
1240 DROP PROCEDURE test_outer;
1241
1242=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node1'
1243--- percona-xtradb-cluster-tests/conf/conf20.cnf-node1 2014-02-08 14:16:24 +0000
1244+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node1 2015-03-24 05:28:01 +0000
1245@@ -15,5 +15,5 @@
1246 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
1247
1248 [sst]
1249-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1250+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1251 encrypt=1
1252
1253=== modified file 'percona-xtradb-cluster-tests/conf/conf20.cnf-node2'
1254--- percona-xtradb-cluster-tests/conf/conf20.cnf-node2 2014-02-08 14:16:24 +0000
1255+++ percona-xtradb-cluster-tests/conf/conf20.cnf-node2 2015-03-24 05:28:01 +0000
1256@@ -15,5 +15,5 @@
1257 encrypt-key=6F3AD9F428143F133FD7D50D77D91EA4
1258
1259 [sst]
1260-cpat='.*galera\.cache$\|.*sst_in_progress$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1261+cpat='.*galera\.cache$\|.*sst_in_progress$\|.*\.sst$\|.*gvwstate\.dat$\|.*grastate\.dat$\|.*\.err$\|.*\.log$\|.*RPM_UPGRADE_MARKER$\|.*RPM_UPGRADE_HISTORY$\|.*\.borr$\|.*\.brn$'
1262 encrypt=1
1263
1264=== modified file 'percona-xtradb-cluster-tests/run.sh'
1265--- percona-xtradb-cluster-tests/run.sh 2014-07-02 15:50:10 +0000
1266+++ percona-xtradb-cluster-tests/run.sh 2015-03-24 05:28:01 +0000
1267@@ -956,7 +956,10 @@
1268 # Execute the test in a subshell. This is required to catch syntax
1269 # errors, as otherwise $? would be 0 in cleanup_on_test_exit resulting in
1270 # passed test
1271- (. $t) || exit $?
1272+ (. $t) || {
1273+ logs
1274+ exit $?
1275+ }
1276 ) > ${worker_outfiles[$worker]} 2>&1 &
1277
1278 worker_pids[$worker]=$!
1279
1280=== added file 'scripts/clustercheck.sh'
1281--- scripts/clustercheck.sh 1970-01-01 00:00:00 +0000
1282+++ scripts/clustercheck.sh 2015-03-24 05:28:01 +0000
1283@@ -0,0 +1,94 @@
1284+#!/bin/bash
1285+#
1286+# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
1287+#
1288+# Authors:
1289+# Raghavendra Prabhu <raghavendra.prabhu@percona.com>
1290+# Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
1291+#
1292+# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
1293+#
1294+# Grant privileges required:
1295+# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
1296+
1297+if [[ $1 == '-h' || $1 == '--help' ]];then
1298+ echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
1299+ exit
1300+fi
1301+
1302+MYSQL_USERNAME="${1-clustercheckuser}"
1303+MYSQL_PASSWORD="${2-clustercheckpassword!}"
1304+AVAILABLE_WHEN_DONOR=${3:-0}
1305+ERR_FILE="${4:-/dev/null}"
1306+AVAILABLE_WHEN_READONLY=${5:-1}
1307+DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
1308+#Timeout exists for instances where mysqld may be hung
1309+TIMEOUT=10
1310+
1311+EXTRA_ARGS=""
1312+if [[ -n "$MYSQL_USERNAME" ]]; then
1313+ EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
1314+fi
1315+if [[ -n "$MYSQL_PASSWORD" ]]; then
1316+ EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
1317+fi
1318+if [[ -r $DEFAULTS_EXTRA_FILE ]];then
1319+ MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
1320+ ${EXTRA_ARGS}"
1321+else
1322+ MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
1323+fi
1324+#
1325+# Perform the query to check the wsrep_local_state
1326+#
1327+WSREP_STATUS=($($MYSQL_CMDLINE -e "SHOW GLOBAL STATUS LIKE 'wsrep_%';" \
1328+ 2>${ERR_FILE} | grep -A 1 -E 'wsrep_local_state$|wsrep_cluster_status$' \
1329+ | sed -n -e '2p' -e '5p' | tr '\n' ' '))
1330+
1331+if [[ ${WSREP_STATUS[1]} == 'Primary' && ( ${WSREP_STATUS[0]} -eq 4 || \
1332+ ( ${WSREP_STATUS[0]} -eq 2 && $AVAILABLE_WHEN_DONOR -eq 1 ) ) ]]
1333+then
1334+
1335+ # Check only when set to 0 to avoid latency in response.
1336+ if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
1337+ READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
1338+ 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1339+
1340+ if [[ "${READ_ONLY}" == "ON" ]];then
1341+ # Percona XtraDB Cluster node local state is 'Synced', but it is in
1342+ # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
1343+ # => return HTTP 503
1344+ # Shell return-code is 1
1345+ echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1346+ echo -en "Content-Type: text/plain\r\n"
1347+ echo -en "Connection: close\r\n"
1348+ echo -en "Content-Length: 43\r\n"
1349+ echo -en "\r\n"
1350+ echo -en "Percona XtraDB Cluster Node is read-only.\r\n"
1351+ sleep 0.1
1352+ exit 1
1353+ fi
1354+
1355+ fi
1356+ # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
1357+ # Shell return-code is 0
1358+ echo -en "HTTP/1.1 200 OK\r\n"
1359+ echo -en "Content-Type: text/plain\r\n"
1360+ echo -en "Connection: close\r\n"
1361+ echo -en "Content-Length: 40\r\n"
1362+ echo -en "\r\n"
1363+ echo -en "Percona XtraDB Cluster Node is synced.\r\n"
1364+ sleep 0.1
1365+ exit 0
1366+else
1367+ # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
1368+ # Shell return-code is 1
1369+ echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1370+ echo -en "Content-Type: text/plain\r\n"
1371+ echo -en "Connection: close\r\n"
1372+ echo -en "Content-Length: 57\r\n"
1373+ echo -en "\r\n"
1374+ echo -en "Percona XtraDB Cluster Node is not synced or non-PRIM. \r\n"
1375+ sleep 0.1
1376+ exit 1
1377+fi
1378
1379=== removed file 'scripts/clustercheck.sh'
1380--- scripts/clustercheck.sh 2014-08-30 06:05:25 +0000
1381+++ scripts/clustercheck.sh 1970-01-01 00:00:00 +0000
1382@@ -1,92 +0,0 @@
1383-#!/bin/bash
1384-#
1385-# Script to make a proxy (ie HAProxy) capable of monitoring Percona XtraDB Cluster nodes properly
1386-#
1387-# Authors:
1388-# Raghavendra Prabhu <raghavendra.prabhu@percona.com>
1389-# Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
1390-#
1391-# Based on the original script from Unai Rodriguez and Olaf (https://github.com/olafz/percona-clustercheck)
1392-#
1393-# Grant privileges required:
1394-# GRANT PROCESS ON *.* TO 'clustercheckuser'@'localhost' IDENTIFIED BY 'clustercheckpassword!';
1395-
1396-if [[ $1 == '-h' || $1 == '--help' ]];then
1397- echo "Usage: $0 <user> <pass> <available_when_donor=0|1> <log_file> <available_when_readonly=0|1> <defaults_extra_file>"
1398- exit
1399-fi
1400-
1401-MYSQL_USERNAME="${1-clustercheckuser}"
1402-MYSQL_PASSWORD="${2-clustercheckpassword!}"
1403-AVAILABLE_WHEN_DONOR=${3:-0}
1404-ERR_FILE="${4:-/dev/null}"
1405-AVAILABLE_WHEN_READONLY=${5:-1}
1406-DEFAULTS_EXTRA_FILE=${6:-/etc/my.cnf}
1407-#Timeout exists for instances where mysqld may be hung
1408-TIMEOUT=10
1409-
1410-EXTRA_ARGS=""
1411-if [[ -n "$MYSQL_USERNAME" ]]; then
1412- EXTRA_ARGS="$EXTRA_ARGS --user=${MYSQL_USERNAME}"
1413-fi
1414-if [[ -n "$MYSQL_PASSWORD" ]]; then
1415- EXTRA_ARGS="$EXTRA_ARGS --password=${MYSQL_PASSWORD}"
1416-fi
1417-if [[ -r $DEFAULTS_EXTRA_FILE ]];then
1418- MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE --connect-timeout=$TIMEOUT \
1419- ${EXTRA_ARGS}"
1420-else
1421- MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT ${EXTRA_ARGS}"
1422-fi
1423-#
1424-# Perform the query to check the wsrep_local_state
1425-#
1426-WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
1427- 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1428-
1429-if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
1430-then
1431-
1432- # Check only when set to 0 to avoid latency in response.
1433- if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
1434- READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
1435- 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
1436-
1437- if [[ "${READ_ONLY}" == "ON" ]];then
1438- # Percona XtraDB Cluster node local state is 'Synced', but it is in
1439- # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
1440- # => return HTTP 503
1441- # Shell return-code is 1
1442- echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1443- echo -en "Content-Type: text/plain\r\n"
1444- echo -en "Connection: close\r\n"
1445- echo -en "Content-Length: 43\r\n"
1446- echo -en "\r\n"
1447- echo -en "Percona XtraDB Cluster Node is read-only.\r\n"
1448- sleep 0.1
1449- exit 1
1450- fi
1451-
1452- fi
1453- # Percona XtraDB Cluster node local state is 'Synced' => return HTTP 200
1454- # Shell return-code is 0
1455- echo -en "HTTP/1.1 200 OK\r\n"
1456- echo -en "Content-Type: text/plain\r\n"
1457- echo -en "Connection: close\r\n"
1458- echo -en "Content-Length: 40\r\n"
1459- echo -en "\r\n"
1460- echo -en "Percona XtraDB Cluster Node is synced.\r\n"
1461- sleep 0.1
1462- exit 0
1463-else
1464- # Percona XtraDB Cluster node local state is not 'Synced' => return HTTP 503
1465- # Shell return-code is 1
1466- echo -en "HTTP/1.1 503 Service Unavailable\r\n"
1467- echo -en "Content-Type: text/plain\r\n"
1468- echo -en "Connection: close\r\n"
1469- echo -en "Content-Length: 44\r\n"
1470- echo -en "\r\n"
1471- echo -en "Percona XtraDB Cluster Node is not synced.\r\n"
1472- sleep 0.1
1473- exit 1
1474-fi
1475
1476=== modified file 'scripts/wsrep_sst_xtrabackup-v2.sh'
1477--- scripts/wsrep_sst_xtrabackup-v2.sh 2014-09-04 18:46:14 +0000
1478+++ scripts/wsrep_sst_xtrabackup-v2.sh 2015-03-24 05:28:01 +0000
1479@@ -29,6 +29,8 @@
1480 encrypt=0
1481 nproc=1
1482 ecode=0
1483+ssyslog=""
1484+ssystag=""
1485 XTRABACKUP_PID=""
1486 SST_PORT=""
1487 REMOTEIP=""
1488@@ -308,6 +310,15 @@
1489 iapts=$(parse_cnf sst inno-apply-opts "")
1490 impts=$(parse_cnf sst inno-move-opts "")
1491 stimeout=$(parse_cnf sst sst-initial-timeout 100)
1492+ ssyslog=$(parse_cnf sst sst-syslog 0)
1493+ ssystag=$(parse_cnf mysqld_safe syslog-tag "${SST_SYSLOG_TAG:-}")
1494+ ssystag+="-"
1495+
1496+ if [[ $ssyslog -ne -1 ]];then
1497+ if my_print_defaults -c $WSREP_SST_OPT_CONF mysqld_safe | tr '_' '-' | grep -q -- "--syslog";then
1498+ ssyslog=1
1499+ fi
1500+ fi
1501 }
1502
1503 get_stream()
1504@@ -363,6 +374,23 @@
1505 if [[ -n ${STATDIR:-} ]];then
1506 [[ -d $STATDIR ]] && rm -rf $STATDIR
1507 fi
1508+
1509+ # Final cleanup
1510+ pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
1511+
1512+ # This means no setsid done in mysqld.
1513+ # We don't want to kill mysqld here otherwise.
1514+ if [[ $$ -eq $pgid ]];then
1515+
1516+ # This means a signal was delivered to the process.
1517+ # So, more cleanup.
1518+ if [[ $estatus -ge 128 ]];then
1519+ kill -KILL -$$ || true
1520+ fi
1521+
1522+ fi
1523+
1524+ exit $estatus
1525 }
1526
1527 check_pid()
1528@@ -403,6 +431,23 @@
1529 if [[ -n $itmpdir ]];then
1530 [[ -d $itmpdir ]] && rm -rf $itmpdir || true
1531 fi
1532+
1533+ # Final cleanup
1534+ pgid=$(ps -o pgid= $$ | grep -o '[0-9]*')
1535+
1536+ # This means no setsid done in mysqld.
1537+ # We don't want to kill mysqld here otherwise.
1538+ if [[ $$ -eq $pgid ]];then
1539+
1540+ # This means a signal was delivered to the process.
1541+ # So, more cleanup.
1542+ if [[ $estatus -ge 128 ]];then
1543+ kill -KILL -$$ || true
1544+ fi
1545+
1546+ fi
1547+
1548+ exit $estatus
1549 }
1550
1551 kill_xtrabackup()
1552@@ -482,7 +527,7 @@
1553 if timeout --help | grep -q -- '-k';then
1554 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
1555 else
1556- ltcmd="timeout $tmt $tcmd"
1557+ ltcmd="timeout -s9 $tmt $tcmd"
1558 fi
1559 timeit "$msg" "$ltcmd | $strmcmd; RC=( "\${PIPESTATUS[@]}" )"
1560 else
1561@@ -551,8 +596,6 @@
1562
1563 read_cnf
1564 setup_ports
1565-get_stream
1566-get_transfer
1567
1568 if ${INNOBACKUPEX_BIN} /tmp --help | grep -q -- '--version-check'; then
1569 disver="--no-version-check"
1570@@ -560,9 +603,40 @@
1571
1572
1573 INNOEXTRA=""
1574-INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
1575-INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
1576-INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
1577+
1578+if [[ $ssyslog -eq 1 ]];then
1579+
1580+ if [[ ! -x `which logger` ]];then
1581+ wsrep_log_error "logger not in path: $PATH. Ignoring"
1582+ else
1583+
1584+ wsrep_log_info "Logging all stderr of SST/Innobackupex to syslog"
1585+
1586+ exec 2> >(logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE)
1587+
1588+ wsrep_log_error()
1589+ {
1590+ logger -p daemon.err -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
1591+ }
1592+
1593+ wsrep_log_info()
1594+ {
1595+ logger -p daemon.info -t ${ssystag}wsrep-sst-$WSREP_SST_OPT_ROLE "$@"
1596+ }
1597+
1598+ INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} 2>&1 | logger -p daemon.err -t ${ssystag}innobackupex-apply "
1599+ 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 "
1600+ 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)"
1601+ fi
1602+
1603+else
1604+ INNOAPPLY="${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$rebuildcmd \${DATA} &>\${DATA}/innobackup.prepare.log"
1605+ INNOMOVE="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $impts --move-back --force-non-empty-directories \${DATA} &>\${DATA}/innobackup.move.log"
1606+ INNOBACKUP="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} $disver $iopts \$tmpopts \$INNOEXTRA --galera-info --stream=\$sfmt \$itmpdir 2>\${DATA}/innobackup.backup.log"
1607+fi
1608+
1609+get_stream
1610+get_transfer
1611
1612 if [ "$WSREP_SST_OPT_ROLE" = "donor" ]
1613 then
1614@@ -903,6 +977,9 @@
1615 fi
1616
1617 else
1618+ # || true if it has already exited
1619+ kill $jpid || true
1620+ rm -rf $DATA/.sst
1621 wsrep_log_info "${IST_FILE} received from donor: Running IST"
1622 fi
1623
1624@@ -910,6 +987,7 @@
1625 wsrep_log_error "SST magic file ${MAGIC_FILE} not found/readable"
1626 exit 2
1627 fi
1628+ wsrep_log_info "Galera co-ords from recovery: $(cat ${MAGIC_FILE})"
1629 cat "${MAGIC_FILE}" # output UUID:seqno
1630 wsrep_log_info "Total time on joiner: $totime seconds"
1631 fi
1632
1633=== modified file 'sql/log.cc'
1634--- sql/log.cc 2015-01-04 16:27:17 +0000
1635+++ sql/log.cc 2015-03-24 05:28:01 +0000
1636@@ -2930,7 +2930,7 @@
1637 if (opt_log_slow_sp_statements &&
1638 thd->spcont &&
1639 my_b_printf(&log_file,
1640- "# Stored routine: %s\n",
1641+ "# Stored_routine: %s\n",
1642 thd->spcont->sp->m_qname.str) == (uint) -1)
1643 tmp_errno= errno;
1644
1645
1646=== modified file 'sql/sql_acl.cc'
1647--- sql/sql_acl.cc 2014-08-23 07:04:19 +0000
1648+++ sql/sql_acl.cc 2015-03-24 05:28:01 +0000
1649@@ -5721,7 +5721,7 @@
1650 */
1651
1652 if (!strcmp(lex_user->user.str,user) &&
1653- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1654+ compare_hostname(&acl_db->host, lex_user->host.str, lex_user->host.str))
1655 {
1656 want_access=acl_db->access;
1657 if (want_access)
1658@@ -5791,7 +5791,9 @@
1659 */
1660
1661 if (!strcmp(lex_user->user.str,user) &&
1662- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1663+ compare_hostname(&grant_table->host,
1664+ lex_user->host.str,
1665+ lex_user->host.str))
1666 {
1667 ulong table_access= grant_table->privs;
1668 if ((table_access | grant_table->cols) != 0)
1669@@ -5940,7 +5942,9 @@
1670 */
1671
1672 if (!strcmp(lex_user->user.str,user) &&
1673- !my_strcasecmp(system_charset_info, lex_user->host.str, host))
1674+ compare_hostname(&grant_proc->host,
1675+ lex_user->host.str,
1676+ lex_user->host.str))
1677 {
1678 ulong proc_access= grant_proc->privs;
1679 if (proc_access != 0)
1680
1681=== modified file 'sql/wsrep_mysqld.cc'
1682--- sql/wsrep_mysqld.cc 2014-08-25 18:02:27 +0000
1683+++ sql/wsrep_mysqld.cc 2015-03-24 05:28:01 +0000
1684@@ -1376,12 +1376,56 @@
1685 const TABLE_LIST* table_list)
1686 {
1687
1688+ LEX *lex;
1689+ int ret= 0;
1690 /*
1691 No isolation for applier or replaying threads.
1692 */
1693 if (thd->wsrep_exec_mode == REPL_RECV) return 0;
1694
1695- int ret= 0;
1696+ lex= thd->lex;
1697+ /*
1698+ * Note: We don't check if enforce_storage_engine succeeds or not
1699+ * We check only the replication requirements here.
1700+ */
1701+ if (!wsrep_replicate_myisam && (!enforce_storage_engine ||
1702+ (enforce_storage_engine && strcasecmp(enforce_storage_engine,"InnoDB"))) &&
1703+ lex->sql_command == SQLCOM_CREATE_TABLE)
1704+ {
1705+ if (table_ && lex->create_info.db_type && \
1706+ lex->create_info.db_type->db_type == DB_TYPE_MYISAM)
1707+ {
1708+ if (db_)
1709+ {
1710+ WSREP_INFO("Cannot replicate MyISAM DDL for %s.%s with wsrep_replicate_myisam OFF", db_, table_);
1711+ }
1712+ else
1713+ {
1714+ WSREP_INFO("Cannot replicate MyISAM DDL for %s with wsrep_replicate_myisam OFF", table_);
1715+ }
1716+ return ret;
1717+ }
1718+ else if (table_list)
1719+ {
1720+ for (const TABLE_LIST *table= table_list; table; table= table->next_global)
1721+ {
1722+ /*
1723+ * First condition is required for IF EXISTS queries
1724+ */
1725+ if (table->table && table->table->file->ht->db_type == DB_TYPE_MYISAM)
1726+ {
1727+ WSREP_INFO("Cannot replicate MyISAM DDL for %s.%s with wsrep_replicate_myisam OFF", table->db, table->table_name);
1728+ /*
1729+ * Break even if one table is MyISAM
1730+ * Note: This may not work well with CREATE TABLE .. SELECT (CTAS)
1731+ * but CTAS is not executed as TOI currently.
1732+ */
1733+ return ret;
1734+ }
1735+ }
1736+ }
1737+ }
1738+
1739 mysql_mutex_lock(&thd->LOCK_wsrep_thd);
1740
1741 if (thd->wsrep_conflict_state == MUST_ABORT)
1742
1743=== modified file 'storage/innobase/include/univ.i'
1744--- storage/innobase/include/univ.i 2015-01-04 16:27:17 +0000
1745+++ storage/innobase/include/univ.i 2015-03-24 05:28:01 +0000
1746@@ -64,7 +64,7 @@
1747 (INNODB_VERSION_MAJOR << 8 | INNODB_VERSION_MINOR)
1748
1749 #ifndef PERCONA_INNODB_VERSION
1750-#define PERCONA_INNODB_VERSION 36.1
1751+#define PERCONA_INNODB_VERSION 37.0
1752 #endif
1753
1754 #define INNODB_VERSION_STR MYSQL_SERVER_VERSION
1755
1756=== modified file 'storage/innobase/lock/lock0lock.c'
1757--- storage/innobase/lock/lock0lock.c 2014-07-02 15:38:37 +0000
1758+++ storage/innobase/lock/lock0lock.c 2015-03-24 05:28:01 +0000
1759@@ -5043,7 +5043,7 @@
1760 }
1761 }
1762
1763- if (!srv_print_innodb_lock_monitor && !srv_show_locks_held) {
1764+ if (!srv_print_innodb_lock_monitor || !srv_show_locks_held) {
1765 nth_trx++;
1766 goto loop;
1767 }
1768
1769=== modified file 'storage/innobase/srv/srv0start.c'
1770--- storage/innobase/srv/srv0start.c 2014-04-20 15:59:19 +0000
1771+++ storage/innobase/srv/srv0start.c 2015-03-24 05:28:01 +0000
1772@@ -125,9 +125,16 @@
1773 static os_file_t files[1000];
1774
1775 /** io_handler_thread parameters for thread identification */
1776-static ulint n[SRV_MAX_N_IO_THREADS + 8];
1777-/** io_handler_thread identifiers */
1778-static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 8];
1779+static ulint n[SRV_MAX_N_IO_THREADS];
1780+/** io_handler_thread identifiers. The extra elements at the end are allocated
1781+as follows:
1782+SRV_MAX_N_IO_THREADS + 1: srv_master_thread
1783+SRV_MAX_N_IO_THREADS + 2: srv_lock_timeout_thread
1784+SRV_MAX_N_IO_THREADS + 3: srv_error_monitor_thread
1785+SRV_MAX_N_IO_THREADS + 4: srv_monitor_thread
1786+SRV_MAX_N_IO_THREADS + 5: srv_LRU_dump_restore_thread
1787+SRV_MAX_N_IO_THREADS + 6: srv_redo_log_follow_thread */
1788+static os_thread_id_t thread_ids[SRV_MAX_N_IO_THREADS + 7];
1789
1790 /** We use this mutex to test the return value of pthread_mutex_trylock
1791 on successful locking. HP-UX does NOT return 0, though Linux et al do. */
1792@@ -1187,7 +1194,7 @@
1793 /* Create the thread that follows the redo log to output the
1794 changed page bitmap */
1795 os_thread_create(&srv_redo_log_follow_thread, NULL,
1796- thread_ids + 5 + SRV_MAX_N_IO_THREADS);
1797+ thread_ids + 6 + SRV_MAX_N_IO_THREADS);
1798 }
1799 }
1800

Subscribers

People subscribed via source and target branches

to all changes: