Merge tag 'mysql-5.1.75' into mysql-5.1-telco-7.1

Author: zmur

cmd-line-utils/libedit/el_terminal.h

@@ -1,7 +1,7 @@
 /*	$NetBSD: terminal.h,v 1.3 2011/07/29 23:44:45 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
  *	The Regents of the University of California. All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -103,7 +103,7 @@ protected int	terminal_settc(EditLine *, int, const Char **);
 protected intterminal_gettc(EditLine *, int, char **);
 protected intterminal_telltc(EditLine *, int, const Char **);
 protected intterminal_echotc(EditLine *, int, const Char **);
-protected voidterminal_writec(EditLine *, Int);
+protected intterminal_writec(EditLine *, Int);
 protected intterminal__putc(EditLine *, Int);
 protected voidterminal__flush(EditLine *);
 

cmd-line-utils/libedit/emacs.c

@@ -1,7 +1,7 @@
 /*	$NetBSD: emacs.c,v 1.25 2011/07/29 15:16:33 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
  *	The Regents of the University of California. All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -58,8 +58,10 @@ em_delete_or_list(EditLine *el, Int c)
 /* if I'm at the end */
 if (el->el_line.cursor == el->el_line.buffer) {
 /* and the beginning */
-terminal_writec(el, c);/* then do an EOF */
-return CC_EOF;
+if(!(terminal_writec(el, c)))/* then do an EOF */
+return CC_EOF;
+else
+return CC_ERROR;
 } else {
 /*
  * Here we could list completions, but it is an

cmd-line-utils/libedit/terminal.c

@@ -1,7 +1,7 @@
 /*	$NetBSD: terminal.c,v 1.10 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
  *	The Regents of the University of California. All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -1271,14 +1271,19 @@ terminal__flush(EditLine *el)
 /* terminal_writec():
  *	Write the given character out, in a human readable form
  */
-protected void
+protected int
 terminal_writec(EditLine *el, Int c)
 {
 Char visbuf[VISUAL_WIDTH_MAX +1];
 ssize_t vcnt = ct_visual_char(visbuf, VISUAL_WIDTH_MAX, c);
-visbuf[vcnt] = '\0';
-terminal_overwrite(el, visbuf, (size_t)vcnt);
-terminal__flush(el);
+if(vcnt == -1)
+return 1; /* Error due to insufficient space */
+else {
+visbuf[vcnt] = '\0';
+terminal_overwrite(el, visbuf, (size_t)vcnt);
+terminal__flush(el);
+return 0;
+}
 }
 
 

cmd-line-utils/libedit/vi.c

@@ -1,7 +1,7 @@
 /*	$NetBSD: vi.c,v 1.41 2011/10/04 15:27:04 christos Exp $	*/
 
 /*-
- * Copyright (c) 1992, 1993
+ * Copyright (c) 1992, 2015
  *	The Regents of the University of California. All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -607,8 +607,10 @@ vi_list_or_eof(EditLine *el, Int c)
 
 if (el->el_line.cursor == el->el_line.lastchar) {
 if (el->el_line.cursor == el->el_line.buffer) {
-terminal_writec(el, c);/* then do a EOF */
-return CC_EOF;
+if(!(terminal_writec(el, c)))/* then do a EOF */
+return CC_EOF;
+else
+return CC_ERROR;
 } else {
 /*
  * Here we could list completions, but it is an

configure.in

@@ -17,6 +17,23 @@
 dnl -*- ksh -*-
 dnl Process this file with autoconf to produce a configure script.
 
+#
+# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
@@ -28,7 +45,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version(). You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.74-ndb-7.1.36], [], [mysql])
+AC_INIT([MySQL Server], [5.1.75-ndb-7.1.36], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

mysql-test/r/openssl_1.result

@@ -3,8 +3,8 @@ create table t1(f1 int);
 insert into t1 values (5);
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-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";
+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";
+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";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);

mysql-test/r/ps_grant.result

@@ -18,7 +18,7 @@ current_user()
 second_user@localhost
 show grants for current_user();
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 prepare s_t9 from 'select c1 as my_col 
  from t9 where c1= 1' ;
@@ -42,7 +42,7 @@ GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
 show grants for second_user@localhost ;
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 GRANT SELECT ON `mysqltest`.`t1` TO 'second_user'@'localhost'
 prepare s_t1 from 'select a as my_col from t1' ;
@@ -63,7 +63,7 @@ GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 show grants for second_user@localhost ;
 Grants for second_user@localhost
-GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD '*13843FE600B19A81E32AF50D4A6FED25875FF1F3'
+GRANT USAGE ON *.* TO 'second_user'@'localhost' IDENTIFIED BY PASSWORD <secret>
 GRANT SELECT ON `mysqltest`.`t9` TO 'second_user'@'localhost'
 execute s_t1 ;
 ERROR 42000: SELECT command denied to user 'second_user'@'localhost' for table 't1'

mysql-test/std_data/cacert.pem

@@ -1,17 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
-7F4WeS07J8LKardSvM0+hOA=
+MIIDmTCCAoGgAwIBAgIJAMzY2iwSCa1lMA0GCSqGSIb3DQEBBQUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTUwMzI3MTM1MjMxWhcNMjUwMjAyMTM1MjMxWjBjMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA1Ydrcrccp8ttYCX+/B/3R/6V30PoEVTpKmALa+P/
+8v26nhTc6Wufjyqxt0hxs65E5jBTk5EsLbJQR4gsjluzvFL/mTrHVefm0Pm/p6yM
+EiEJYbn20Q2eR88WnxWUbXXz6SiTSb3u09TntFqvpqh5Ex8DvoSCHTMaEZ2wguro
+HJMUrz5li+ToiimS8DZUBAQxJhikggwZX2h8bF4L+Jzd0RS1d1mrNCUnl6KZ6oYj
+VEWSbLfmcMhUFQJdo/PXsJBl/SICWURP0pvRoZ/5Qic/VBdHmdltM+pfu15n0Wpd
+7zAQo0Uo95i4lR2pDknPvD3EJjz5dRvPhq024pHo+n72DwIDAQABo1AwTjAdBgNV
+HQ4EFgQUay8Rmt8Sh5YOKLDso0bNCBHnoHEwHwYDVR0jBBgwFoAUay8Rmt8Sh5YO
+KLDso0bNCBHnoHEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAKLCl
+4lVEQyBpWuzAPE6xsayrbmGyO5mEzL8B4MWIiPkjVEemjGMNTa8mV7VUl/rgttru
+hz3VhlWpw6tQTrExTqVWOafVOva4XiJ54hnshkqU2KXc4eX7PIG/eyAAphnj6hnX
+QSWzDx+PKvidrJmyAqylVva3ApOO+5Sh5f/qw57id/Vy8xjtjeW2uWLG84iEVlPp
++sBWPjrM0EXGCZ470g19D35/JY6Gy+7e0Bk4RZuXITP+V7CdrjkDGu6w/zip7ukA
+32snXHeaUwrp8mbDY0c9t5SVM8RlaqrtzUYid2+5RBCo3LYIypCBOYM2BMVFoy16
+T4B8hWXZ/t+ylnp+Mw==
 -----END CERTIFICATE-----

mysql-test/std_data/client-cert.pem

@@ -1,46 +1,69 @@
 Certificate:
  Data:
  Version: 1 (0x0)
- Serial Number: 1048577 (0x100001)
-  Signature Algorithm: md5WithRSAEncryption
- Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+ Serial Number: 1 (0x1)
+ Signature Algorithm: sha1WithRSAEncryption
+ Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
  Validity
- Not Before: Jan 29 11:50:22 2010 GMT
- Not After : Jan 28 11:50:22 2015 GMT
- Subject: C=SE, ST=Uppsala, O=MySQL AB
+ Not Before: Mar 27 13:59:18 2015 GMT
+ Not After : Feb 2 13:59:18 2025 GMT
+ Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
  Subject Public Key Info:
  Public Key Algorithm: rsaEncryption
- Public-Key: (1024 bit)
+ Public-Key: (2048 bit)
  Modulus:
- 00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
- 78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
- a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
- 9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
- 15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
- 87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
- 8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
- a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
- fc:3d:78:9b:49:6e:86:83:77
+ 00:9d:39:e4:6d:ce:1c:e0:7c:77:aa:9a:2b:94:db:
+ 53:48:2d:b5:77:6c:d3:63:73:b6:ff:b0:31:89:56:
+ 56:dd:fb:ce:ed:d8:94:f5:72:3d:4d:bf:a6:8b:43:
+ 64:f6:2d:66:5d:5a:77:3f:ae:cd:55:f0:02:03:0d:
+ ac:72:bf:7c:b6:a9:12:d7:fe:66:d6:ca:53:4e:95:
+ 0c:f2:a2:c1:2d:b2:d5:b0:d8:01:4e:07:89:ee:c8:
+ 9a:16:f5:1f:0b:4f:04:e3:dc:00:3a:2f:c4:20:ab:
+ 0f:f4:81:f1:e3:2e:ba:8f:4b:3d:cc:b2:7f:62:3a:
+ 3e:e9:ef:dd:2b:40:99:b5:98:2d:8f:2a:00:20:34:
+ de:6a:7a:66:fa:c8:8c:b2:c3:ad:7d:4d:31:d0:ba:
+ 35:ee:9d:c7:e3:25:48:02:6d:72:07:d0:ce:db:3b:
+ 7d:83:60:07:39:1a:76:4f:69:23:f3:45:30:07:bd:
+ eb:c9:b9:ca:91:dd:21:65:ac:e4:53:ad:10:08:71:
+ bd:74:15:56:a7:d6:d7:d8:fc:91:ac:53:c3:50:86:
+ 9f:53:1e:a7:f3:c5:bd:17:bd:fd:0f:6c:b4:c0:c8:
+ 7b:e6:dd:69:c2:f6:07:09:e4:a1:6f:a7:c7:03:b9:
+ b8:d9:aa:eb:95:b5:37:2f:cb:8e:fc:55:f0:ad:c7:
+ 33:f3
  Exponent: 65537 (0x10001)
- Signature Algorithm: md5WithRSAEncryption
- 5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
- 34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
- c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
- 01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
- 89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
- 02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
- 02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
- 32:0b
+ Signature Algorithm: sha1WithRSAEncryption
+ 2b:f5:95:a5:83:87:9b:c3:77:57:10:e0:64:0f:3a:6a:a6:5f:
+ 9a:dd:16:b3:71:b1:0c:d7:59:93:ff:89:9f:d0:50:de:cd:c8:
+ d5:a3:2a:1c:6e:e1:0b:82:e4:ae:57:1b:13:c9:c6:ea:09:21:
+ 7f:5b:ff:3d:8d:77:25:a8:ed:a8:7c:9d:95:b0:55:60:fc:19:
+ f3:4f:3f:73:1f:72:d8:2e:c7:c6:bb:16:1d:33:07:bf:ea:6b:
+ dc:5f:5d:d0:53:2e:b2:96:ad:ea:64:5f:cb:f4:8c:7a:16:bb:
+ cf:42:b8:f0:9e:33:cb:29:f5:a7:4e:af:b2:a2:a6:4f:8e:6d:
+ 85:a1:63:43:aa:dd:11:1d:b2:80:ae:22:6a:b2:4b:0c:27:3c:
+ b4:59:d1:b4:77:48:69:ff:3b:e0:48:e8:3c:3f:df:14:43:80:
+ 68:97:06:fa:56:d6:dd:a3:7c:d0:0d:06:3a:a3:13:6f:d0:09:
+ d2:2e:89:5b:b8:22:3f:d5:da:e7:4c:69:ea:55:03:ef:5e:55:
+ 49:18:a5:1a:b4:be:1b:68:b4:65:d0:64:ab:29:9d:81:5f:05:
+ 31:08:0f:12:b9:c9:6e:8e:2e:b5:8f:d4:e9:55:94:30:e5:13:
+ d4:84:ad:4e:15:62:79:32:36:e8:67:b0:12:14:73:c0:bc:99:
+ 44:cf:b2:fb
 -----BEGIN CERTIFICATE-----
-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
-RrLFnG84kYo1Mgs=
+MIIDPjCCAiYCAQEwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCU0UxEjAQBgNV
+BAgMCVN0b2NraG9sbTESMBAGA1UEBwwJU3RvY2tob2xtMQ8wDQYDVQQKDAZPcmFj
+bGUxDjAMBgNVBAsMBU15U1FMMQswCQYDVQQDDAJDQTAeFw0xNTAzMjcxMzU5MTha
+Fw0yNTAyMDIxMzU5MThaMGcxCzAJBgNVBAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hv
+bG0xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQL
+DAVNeVNRTDEPMA0GA1UEAwwGQ2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAnTnkbc4c4Hx3qporlNtTSC21d2zTY3O2/7AxiVZW3fvO7diU9XI9
+Tb+mi0Nk9i1mXVp3P67NVfACAw2scr98tqkS1/5m1spTTpUM8qLBLbLVsNgBTgeJ
+7siaFvUfC08E49wAOi/EIKsP9IHx4y66j0s9zLJ/Yjo+6e/dK0CZtZgtjyoAIDTe
+anpm+siMssOtfU0x0Lo17p3H4yVIAm1yB9DO2zt9g2AHORp2T2kj80UwB73rybnK
+kd0hZazkU60QCHG9dBVWp9bX2PyRrFPDUIafUx6n88W9F739D2y0wMh75t1pwvYH
+CeShb6fHA7m42arrlbU3L8uO/FXwrccz8wIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
+AQAr9ZWlg4ebw3dXEOBkDzpqpl+a3RazcbEM11mT/4mf0FDezcjVoyocbuELguSu
+VxsTycbqCSF/W/89jXclqO2ofJ2VsFVg/BnzTz9zH3LYLsfGuxYdMwe/6mvcX13Q
+Uy6ylq3qZF/L9Ix6FrvPQrjwnjPLKfWnTq+yoqZPjm2FoWNDqt0RHbKAriJqsksM
+Jzy0WdG0d0hp/zvgSOg8P98UQ4Bolwb6Vtbdo3zQDQY6oxNv0AnSLolbuCI/1drn
+TGnqVQPvXlVJGKUatL4baLRl0GSrKZ2BXwUxCA8Sucluji61j9TpVZQw5RPUhK1O
+FWJ5MjboZ7ASFHPAvJlEz7L7
 -----END CERTIFICATE-----

mysql-test/std_data/client-key.pem

@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----