Skip to content

Commit 27439ee

Browse files
author
Sergei Golubchik
committed
5.5 merge
2 parents 1e227b8 + 5f63c9c commit 27439ee

File tree

12 files changed

+502
-231
lines changed

12 files changed

+502
-231
lines changed

‎client/mysqlcheck.c

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -521,9 +521,6 @@ static uint fixed_name_length(const char *name)
521521
{
522522
if (*p == '`')
523523
extra_length++;
524-
else if (*p == '.')
525-
extra_length+= 2;
526-
527524
}
528525
DBUG_RETURN((uint) ((p - name) + extra_length));
529526
}
@@ -537,11 +534,6 @@ static char *fix_table_name(char *dest, char *src)
537534
for (; *src; src++)
538535
{
539536
switch (*src) {
540-
case '.': /* add backticks around '.' */
541-
*dest++= '`';
542-
*dest++= '.';
543-
*dest++= '`';
544-
break;
545537
case '`': /* escape backtick character */
546538
*dest++= '`';
547539
/* fall through */
@@ -836,13 +828,17 @@ static void print_result()
836828
{
837829
MYSQL_RES *res;
838830
MYSQL_ROW row;
839-
char prev[(NAME_LEN+9)*2+2];
831+
char prev[(NAME_LEN+9)*3+2];
840832
char prev_alter[MAX_ALTER_STR_SIZE];
833+
char *db_name;
834+
uint length_of_db;
841835
uint i;
842836
my_bool found_error=0, table_rebuild=0;
843837
DBUG_ENTER("print_result");
844838

845839
res = mysql_use_result(sock);
840+
db_name= sock->db;
841+
length_of_db= strlen(db_name);
846842

847843
prev[0] = '\0';
848844
prev_alter[0]= 0;
@@ -866,10 +862,16 @@ static void print_result()
866862
if (prev_alter[0])
867863
insert_dynamic(&alter_table_cmds, (uchar*) prev_alter);
868864
else
869-
insert_dynamic(&tables4rebuild, (uchar*) prev);
865+
{
866+
char *table_name= prev + (length_of_db+1);
867+
insert_dynamic(&tables4rebuild, (uchar*) table_name);
868+
}
870869
}
871870
else
872-
insert_dynamic(&tables4repair, prev);
871+
{
872+
char *table_name= prev + (length_of_db+1);
873+
insert_dynamic(&tables4repair, table_name);
874+
}
873875
}
874876
found_error=0;
875877
table_rebuild=0;
@@ -910,10 +912,16 @@ static void print_result()
910912
if (prev_alter[0])
911913
insert_dynamic(&alter_table_cmds, prev_alter);
912914
else
913-
insert_dynamic(&tables4rebuild, prev);
915+
{
916+
char *table_name= prev + (length_of_db+1);
917+
insert_dynamic(&tables4rebuild, table_name);
918+
}
914919
}
915920
else
916-
insert_dynamic(&tables4repair, prev);
921+
{
922+
char *table_name= prev + (length_of_db+1);
923+
insert_dynamic(&tables4repair, table_name);
924+
}
917925
}
918926
mysql_free_result(res);
919927
DBUG_VOID_RETURN;

‎mysql-test/lib/generate-ssl-certs.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#/bin/sh -xe
2+
3+
# simply run me from mysql-test/
4+
cd std_data/
5+
6+
# boilerplace for "openssl ca" and /etc/ssl/openssl.cnf
7+
rm -rf demoCA
8+
mkdir demoCA demoCA/private demoCA/newcerts
9+
touch demoCA/index.txt
10+
echo 01 > demoCA/serial
11+
12+
# CA certificate, self-signed
13+
openssl req -x509 -newkey rsa:2048 -keyout demoCA/private/cakey.pem -out cacert.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB' -text
14+
15+
# server certificate signing request and private key
16+
openssl req -newkey rsa:1024 -keyout server-key.pem -out demoCA/server-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB/CN=localhost'
17+
# convert the key to yassl compatible format
18+
openssl rsa -in server-key.pem -out server-key.pem
19+
# sign the server certificate with CA certificate
20+
openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out server-cert.pem -infiles demoCA/server-req.pem
21+
22+
openssl req -newkey rsa:8192 -keyout server8k-key.pem -out demoCA/server8k-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB/CN=server'
23+
openssl rsa -in server8k-key.pem -out server8k-key.pem
24+
openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out server8k-cert.pem -infiles demoCA/server8k-req.pem
25+
26+
openssl req -newkey rsa:1024 -keyout client-key.pem -out demoCA/client-req.pem -days 7300 -nodes -subj '/C=SE/ST=Uppsala/O=MySQL AB'
27+
openssl rsa -in client-key.pem -out client-key.pem
28+
# if the folloing will require a common name - that's defined in /etc/ssl/openssl.cnf, under policy_anything
29+
openssl ca -days 7300 -batch -cert cacert.pem -policy policy_anything -out client-cert.pem -infiles demoCA/client-req.pem
30+
31+
rm -rf demoCA

‎mysql-test/r/mysqlcheck.result

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
call mtr.add_suppression("Invalid .old.. table or database name");
2-
DROP TABLE IF EXISTS t1, `t``1`, `t 1`;
3-
drop view if exists v1;
2+
DROP TABLE IF EXISTS t1, `t``1`, `t 1`, test.`t.1`, v1;
3+
drop view if exists t1, `t``1`, `t 1`, test.`t.1`, v1;
44
drop database if exists client_test_db;
55
mtr.global_suppressions OK
66
mtr.test_suppressions OK
@@ -340,3 +340,10 @@ CHECK TABLE bug47205 FOR UPGRADE;
340340
Table Op Msg_type Msg_text
341341
test.bug47205 check status OK
342342
DROP TABLE bug47205;
343+
#
344+
#MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names
345+
#
346+
CREATE TABLE test.`t.1` (id int);
347+
mysqlcheck test t.1
348+
test.t.1 OK
349+
drop table test.`t.1`;

‎mysql-test/r/ssl.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Variable_name Value
33
Ssl_cipher DHE-RSA-AES256-SHA
44
SHOW STATUS LIKE 'Ssl_server_not_before';
55
Variable_name Value
6-
Ssl_server_not_before Feb 20 02:55:06 2010 GMT
6+
Ssl_server_not_before Jan 29 13:33:36 2015 GMT
77
SHOW STATUS LIKE 'Ssl_server_not_after';
88
Variable_name Value
9-
Ssl_server_not_after Sep 3 02:55:06 2030 GMT
9+
Ssl_server_not_after Jan 24 13:33:36 2035 GMT
1010
drop table if exists t1,t2,t3,t4;
1111
CREATE TABLE t1 (
1212
Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,

‎mysql-test/std_data/cacert.pem

Lines changed: 75 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,77 @@
1+
Certificate:
2+
Data:
3+
Version: 3 (0x2)
4+
Serial Number: 18344029820145564920 (0xfe9315ee3af2fcf8)
5+
Signature Algorithm: sha1WithRSAEncryption
6+
Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
7+
Validity
8+
Not Before: Jan 29 13:33:36 2015 GMT
9+
Not After : Jan 24 13:33:36 2035 GMT
10+
Subject: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
11+
Subject Public Key Info:
12+
Public Key Algorithm: rsaEncryption
13+
Public-Key: (2048 bit)
14+
Modulus:
15+
00:ad:79:3b:d1:c4:f3:fd:72:e8:4a:9e:54:db:44:
16+
86:c7:57:a9:53:2e:01:5a:5b:04:b8:b7:15:02:28:
17+
b2:e8:8a:8d:0e:32:29:a6:cc:63:00:fb:e4:7a:ec:
18+
27:b0:09:8f:4d:34:95:c5:9e:2e:92:20:8b:ec:88:
19+
d3:08:75:c7:c0:61:46:60:79:bb:0f:5f:e4:08:d7:
20+
b2:20:08:1a:71:a9:ea:f2:d6:55:40:26:82:9b:2c:
21+
6a:00:66:74:58:ea:e8:6c:77:74:81:10:3b:78:7f:
22+
20:75:9c:ac:7a:63:af:0e:b6:7b:e8:94:13:00:b8:
23+
7d:33:7a:c7:49:1f:b2:84:ce:0d:89:4a:97:ee:61:
24+
0a:1d:8b:a7:8b:45:90:dc:cc:e6:56:dc:aa:28:b2:
25+
cb:83:09:e7:7b:9a:7c:3e:da:4f:11:d0:b2:95:0d:
26+
96:c0:b0:41:63:2d:2b:45:2f:6d:46:38:5a:b0:93:
27+
e6:07:af:d1:2f:15:ff:84:f3:05:62:a5:28:1a:a4:
28+
40:23:3d:c6:77:60:2c:55:7d:fd:af:da:4a:e8:fb:
29+
16:03:9a:67:4b:76:a6:ec:96:ba:46:86:f2:fb:7c:
30+
eb:2c:59:5c:af:e7:79:50:26:05:d4:71:c3:d5:62:
31+
d5:2b:17:35:d3:32:4e:b4:df:30:7d:8b:fd:ba:c3:
32+
a6:5d
33+
Exponent: 65537 (0x10001)
34+
X509v3 extensions:
35+
X509v3 Subject Key Identifier:
36+
D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
37+
X509v3 Authority Key Identifier:
38+
keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
39+
40+
X509v3 Basic Constraints:
41+
CA:TRUE
42+
Signature Algorithm: sha1WithRSAEncryption
43+
8d:9f:56:93:67:4b:77:e1:4c:f0:3c:6b:9c:8a:a0:a5:3d:5d:
44+
a7:21:72:5e:bc:4c:88:16:61:95:3d:e6:34:da:a6:b0:8c:6e:
45+
94:4c:69:ea:c6:8a:fa:2c:3d:bf:f9:8e:b5:d1:69:ac:a1:46:
46+
12:95:bc:fd:67:21:1e:ca:0f:49:77:f8:54:29:aa:06:5b:08:
47+
0b:8e:0b:4f:9d:52:da:03:9e:a1:31:1b:4a:bb:df:cb:d7:ba:
48+
b1:20:d7:77:bc:3b:87:e4:ae:46:59:13:88:cd:76:ab:15:68:
49+
c5:90:d7:01:fb:7b:16:30:7f:f8:1e:c5:3d:a3:e2:61:d9:35:
50+
fe:70:af:9a:47:12:59:26:27:b1:f6:a2:d8:99:80:a1:a4:a3:
51+
a3:77:ad:40:90:8c:4e:7e:83:b0:c0:0e:fb:0b:c3:9f:ac:8d:
52+
ee:65:fe:7d:85:2b:b3:93:62:56:50:f3:ca:68:68:76:37:9d:
53+
e7:85:13:45:c1:c8:9e:c6:ba:eb:ef:24:85:e8:47:31:82:53:
54+
1b:c4:66:b3:c3:e6:89:5f:3e:18:9f:f5:ed:66:19:9e:57:5b:
55+
3d:6a:2f:fb:c2:e3:5a:40:d0:5b:2e:ac:f6:a4:c6:5b:ee:a5:
56+
76:a0:af:a8:c0:c0:e1:2f:78:6c:7b:fa:fe:a8:2d:8b:cf:2b:
57+
c8:87:ee:09
158
-----BEGIN CERTIFICATE-----
2-
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
2277
-----END CERTIFICATE-----

‎mysql-test/std_data/client-cert.pem

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,68 @@
11
Certificate:
22
Data:
33
Version: 3 (0x2)
4-
Serial Number: 6 (0x6)
5-
Signature Algorithm: sha1WithRSAEncryption
4+
Serial Number: 3 (0x3)
5+
Signature Algorithm: sha1WithRSAEncryption
66
Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
77
Validity
8-
Not Before: Feb 20 03:03:26 2010 GMT
9-
Not After : Sep 3 03:03:26 2030 GMT
8+
Not Before: Jan 29 13:33:49 2015 GMT
9+
Not After : Jan 24 13:33:49 2035 GMT
1010
Subject: C=SE, ST=Uppsala, O=MySQL AB
1111
Subject Public Key Info:
1212
Public Key Algorithm: rsaEncryption
13-
RSA Public Key: (1024 bit)
14-
Modulus (1024 bit):
15-
00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2:
16-
23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f:
17-
4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d:
18-
78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d:
19-
59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4:
20-
51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56:
21-
bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df:
22-
65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4:
23-
c1:60:19:5f:96:56:7e:55:19
13+
Public-Key: (1024 bit)
14+
Modulus:
15+
00:c1:f6:6e:41:de:b5:80:fe:10:6d:c5:15:98:53:
16+
85:4a:88:51:06:85:30:7f:c9:92:87:51:3a:d6:8d:
17+
d3:9c:0e:91:c2:39:30:e9:b2:6e:53:4a:3a:aa:a3:
18+
8b:ce:c0:93:94:c9:65:db:89:8e:21:2b:af:2a:ff:
19+
7b:5a:0f:b9:03:99:f0:eb:20:d4:2c:39:00:0e:5a:
20+
b7:2b:17:e6:78:54:4f:54:23:36:81:b2:db:3e:48:
21+
cd:8e:14:36:b4:4f:6e:4d:a1:84:64:29:b7:68:3c:
22+
45:3e:eb:9a:9b:8f:e2:d0:35:a8:0c:e6:70:4e:ac:
23+
78:74:d5:45:aa:67:33:81:0d
2424
Exponent: 65537 (0x10001)
2525
X509v3 extensions:
2626
X509v3 Basic Constraints:
2727
CA:FALSE
28+
Netscape Comment:
29+
OpenSSL Generated Certificate
2830
X509v3 Subject Key Identifier:
29-
8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F
31+
17:61:EA:3F:25:92:55:2B:04:1C:D8:C7:A9:F6:61:C9:D9:99:A4:C9
3032
X509v3 Authority Key Identifier:
31-
keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
32-
DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
33-
serial:BE:58:AD:4C:1F:3D:25:95
33+
keyid:D0:25:36:E4:E6:DB:8B:6E:4F:8A:4D:20:48:A4:21:3A:58:7E:EF:C4
3434

3535
Signature Algorithm: sha1WithRSAEncryption
36-
a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc:
37-
b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17:
38-
6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79:
39-
ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb:
40-
45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1:
41-
21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98:
42-
4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73:
43-
3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64:
44-
62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74:
45-
e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18:
46-
55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff:
47-
12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2:
48-
ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93:
49-
54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f:
50-
1d:c4:76:d0
36+
78:ea:34:4f:ac:c5:0b:17:bd:c9:f4:28:bd:b2:b1:cd:a7:58:
37+
74:4f:00:82:82:c8:a5:71:fe:f4:2f:54:d0:e0:ae:b0:57:87:
38+
7d:e6:2e:14:4a:49:21:43:c3:b5:39:e4:7c:0f:fe:8b:c5:5d:
39+
5e:84:bc:42:2a:2a:a1:69:10:30:dc:e8:a6:ba:79:8b:a0:56:
40+
09:ab:a3:ce:db:32:b2:10:7a:9f:b7:7a:46:80:4a:90:59:af:
41+
81:5c:c7:92:20:46:9d:0e:27:20:e5:9a:da:b3:26:96:37:3b:
42+
87:e7:13:93:ba:8d:be:d3:9d:7a:cb:6d:96:75:36:54:e1:cd:
43+
7e:ff:0d:2d:3c:6a:cd:50:b3:a5:73:a8:83:a0:a7:a2:aa:fa:
44+
6e:49:b9:77:fc:03:16:21:bb:c7:8a:4a:79:5f:a9:7e:b9:21:
45+
6d:84:a7:5f:96:60:38:42:f7:d0:82:de:87:74:d4:05:93:b8:
46+
94:ae:d1:eb:0c:26:96:60:d5:d8:6c:cc:17:40:85:2f:ac:f8:
47+
31:f5:f5:76:d0:f1:3f:aa:87:81:b9:a0:93:71:28:6a:b2:f6:
48+
74:36:a1:fa:f8:dc:39:a8:cd:b7:75:79:d0:40:73:6c:d6:b2:
49+
dc:9e:58:a5:51:e5:09:f0:3d:c2:2f:3d:16:ab:41:26:ec:3b:
50+
71:04:2d:eb
5151
-----BEGIN CERTIFICATE-----
52-
MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
53-
MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
54-
UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG
55-
EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ
56-
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e
57-
Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE
58-
UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ
59-
X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl
60-
eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG
61-
MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz
62-
YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA
63-
A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q
64-
xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh
65-
gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7
66-
XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST
67-
YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU
68-
EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ
52+
MIIC6DCCAdCgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
53+
MA4GA1UECAwHVXBwc2FsYTEQMA4GA1UEBwwHVXBwc2FsYTERMA8GA1UECgwITXlT
54+
UUwgQUIwHhcNMTUwMTI5MTMzMzQ5WhcNMzUwMTI0MTMzMzQ5WjAyMQswCQYDVQQG
55+
EwJTRTEQMA4GA1UECAwHVXBwc2FsYTERMA8GA1UECgwITXlTUUwgQUIwgZ8wDQYJ
56+
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMH2bkHetYD+EG3FFZhThUqIUQaFMH/JkodR
57+
OtaN05wOkcI5MOmyblNKOqqji87Ak5TJZduJjiErryr/e1oPuQOZ8Osg1Cw5AA5a
58+
tysX5nhUT1QjNoGy2z5IzY4UNrRPbk2hhGQpt2g8RT7rmpuP4tA1qAzmcE6seHTV
59+
RapnM4ENAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
60+
U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQXYeo/JZJVKwQc2Mep
61+
9mHJ2ZmkyTAfBgNVHSMEGDAWgBTQJTbk5tuLbk+KTSBIpCE6WH7vxDANBgkqhkiG
62+
9w0BAQUFAAOCAQEAeOo0T6zFCxe9yfQovbKxzadYdE8AgoLIpXH+9C9U0OCusFeH
63+
feYuFEpJIUPDtTnkfA/+i8VdXoS8QioqoWkQMNzoprp5i6BWCaujztsyshB6n7d6
64+
RoBKkFmvgVzHkiBGnQ4nIOWa2rMmljc7h+cTk7qNvtOdesttlnU2VOHNfv8NLTxq
65+
zVCzpXOog6Cnoqr6bkm5d/wDFiG7x4pKeV+pfrkhbYSnX5ZgOEL30ILeh3TUBZO4
66+
lK7R6wwmlmDV2GzMF0CFL6z4MfX1dtDxP6qHgbmgk3EoarL2dDah+vjcOajNt3V5
67+
0EBzbNay3J5YpVHlCfA9wi89FqtBJuw7cQQt6w==
6968
-----END CERTIFICATE-----

‎mysql-test/std_data/client-key.pem

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
-----BEGIN RSA PRIVATE KEY-----
2-
MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I
3-
RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u
4-
sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB
5-
AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5
6-
MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM
7-
mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe
8-
ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA
9-
FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI
10-
iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty
11-
EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023
12-
bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE
13-
z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK
14-
Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg==
2+
MIICXQIBAAKBgQDB9m5B3rWA/hBtxRWYU4VKiFEGhTB/yZKHUTrWjdOcDpHCOTDp
3+
sm5TSjqqo4vOwJOUyWXbiY4hK68q/3taD7kDmfDrINQsOQAOWrcrF+Z4VE9UIzaB
4+
sts+SM2OFDa0T25NoYRkKbdoPEU+65qbj+LQNagM5nBOrHh01UWqZzOBDQIDAQAB
5+
AoGANRzgEFWF6i6oHQbs5OtqAoDVfy2VnEh8QWWy8PGhUoiCzWaPyE69+zzGV9e0
6+
/wao4wNLSxSdwOOPcfzHsF/Bz4plBP4GOhq1BJ4TU13RMlVpU0G2CCJNmc7Fz/g/
7+
iFk7NrhJ+hS22QuC5R/upQaDmKvn3USppXurh7NbayjQRhkCQQDsd2XEdHzOqr1A
8+
fvd3tzAbmOoiSz05OHaVNJdHwsnWRASgn//YHCxaQCw/mt3hWjvxgRfS3kuDGFcy
9+
KAwa/tbnAkEA0fwyfqZERZIRH1sSxXclqbmSRfF9PsDvS8DsjjUVkj/Td4KV7DKI
10+
OWEv9d3VZvioIVaACeoGgmc6jdD6tAGN6wJBAN5Pyj+OfKAX6WEvfRzx/qqTctvW
11+
/LJFIUdZcDipKvTkca1Jf1D/+7rFxlPuF1f8a4q7oVhAYaHYSnH/MJJYsFUCQQDB
12+
ukofvGe6Q7NWWWCtG2p89r7zloM1VSywmBHmdSUso4QGe0yz+D7jqT1lOT872+bJ
13+
sxM3klhlELXdxtK1JcX3AkBqnkbKafhVdIojRvxwY1NXD2HrxZGNbl+r/0usrQc9
14+
viRpCxVsqPeseK9sxbL+xDJ6a1ofJrLg8YJLFapOqWTh
1515
-----END RSA PRIVATE KEY-----

0 commit comments

Comments
 (0)