From 89b1bb0be8c59eaf77e17e3e51ee9252e76e5c1d Mon Sep 17 00:00:00 2001 From: Matthew Montgomery Date: Tue, 26 Jan 2010 16:39:32 -0600 Subject: [PATCH 1/2] Bug #50642 ssl certs in test suite are expiring soon. --- mysql-test/std_data/client-cert.pem | 59 +++++---- mysql-test/std_data/server-cert.pem | 60 +++++---- mysql-test/std_data/server8k-cert.pem | 169 ++++++++++++++++++-------- 3 files changed, 176 insertions(+), 112 deletions(-) diff --git a/mysql-test/std_data/client-cert.pem b/mysql-test/std_data/client-cert.pem index 9300520793e..854b790c961 100644 --- a/mysql-test/std_data/client-cert.pem +++ b/mysql-test/std_data/client-cert.pem @@ -1,12 +1,13 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 3 (0x3) + Serial Number: + cb:73:4b:30:a0:cb:f7:d9 Signature Algorithm: sha1WithRSAEncryption - Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Issuer: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com Validity - Not Before: Jan 28 11:04:39 2009 GMT - Not After : Jan 28 11:04:39 2010 GMT + Not Before: Jan 26 22:32:38 2010 GMT + Not After : Jan 26 22:32:38 2011 GMT Subject: C=SE, ST=Uppsala, O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -19,37 +20,33 @@ Certificate: 74:fb:56:1e:37 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE X509v3 Subject Key Identifier: 58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85 X509v3 Authority Key Identifier: - keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF - DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB - serial:95:E9:78:F5:34:50:E4:D5 + keyid:58:30:B5:9B:2C:05:94:06:BA:3D:3C:F0:B2:CD:1D:67:65:E3:7F:85 + DirName:/C=SE/ST=Uppsala/O=MySQL AB/emailAddress=abstract.mysql.developer@mysql.com + serial:CB:73:4B:30:A0:CB:F7:D9 + X509v3 Basic Constraints: + CA:TRUE Signature Algorithm: sha1WithRSAEncryption - 05:19:e3:13:14:fc:c5:28:bf:69:f8:00:b3:25:cb:bd:ca:9f: - 2f:4c:b3:a8:04:11:f0:74:27:bd:82:2c:b4:49:9b:a7:59:f0: - f7:87:d1:e0:ba:99:a2:fe:4b:1d:10:6f:e4:a2:b3:cd:7f:8b: - 68:31:46:ee:cd:9e:e2:47:e1:4c:fa:74:d1:e2:8b:cc:a0:4b: - a8:24:d1:a4:c3:6b:2a:c6:28:cd:41:e0:06:48:e6:cf:f2:3c: - ca:37:95:d7:29:64:6b:91:91:83:e7:ac:c8:0b:87:bc:da:a6: - aa:f1:44:43:c8:74:7b:15:26:91:2e:03:c4:71:50:6c:f8:68: - dc:8c + 59:07:27:11:c3:39:b1:9c:6c:9b:12:9f:c9:e1:69:31:a7:10: + b1:fb:5f:e2:8d:83:9d:c8:f0:8b:ff:10:ee:ba:37:45:75:f7: + dd:e6:d4:bb:f5:13:27:ec:82:2e:0d:83:f4:ce:d0:04:db:88: + 20:80:dd:6e:7b:4e:88:f5:15:d5 -----BEGIN CERTIFICATE----- -MIICfzCCAeigAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ -MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT -UUwgQUIwHhcNMDkwMTI4MTEwNDM5WhcNMTAwMTI4MTEwNDM5WjBlMQswCQYDVQQG -EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkq -hkiG9w0BCQEWImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDAN -BgkqhkiG9w0BAQEFAANLADBIAkEA4VIwLNm+ZCiRXXr92ekUNXrSlE6RRuDbn2t5 -9EysbgdhNIZ0YqeoRK/6h4eofUJh/6tQ1Hu/dfrV1bN0+1YeNwIDAQABo4GjMIGg -MAkGA1UdEwQCMAAwHQYDVR0OBBYEFFgwtZssBZQGuj088LLNHWdl43+FMHQGA1Ud -IwRtMGuAFPLi6lVlpJrirJ2X9UVs9veMEa3foUikRjBEMQswCQYDVQQGEwJTRTEQ -MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT -UUwgQUKCCQCV6Xj1NFDk1TANBgkqhkiG9w0BAQUFAAOBgQAFGeMTFPzFKL9p+ACz -Jcu9yp8vTLOoBBHwdCe9giy0SZunWfD3h9Hgupmi/ksdEG/korPNf4toMUbuzZ7i -R+FM+nTR4ovMoEuoJNGkw2sqxijNQeAGSObP8jzKN5XXKWRrkZGD56zIC4e82qaq -8URDyHR7FSaRLgPEcVBs+GjcjA== +MIICjjCCAjigAwIBAgIJAMtzSzCgy/fZMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV +BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjExMC8G +CSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2ZWxvcGVyQG15c3FsLmNvbTAe +Fw0xMDAxMjYyMjMyMzhaFw0xMTAxMjYyMjMyMzhaMGUxCzAJBgNVBAYTAlNFMRAw +DgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjExMC8GCSqGSIb3DQEJ +ARYiYWJzdHJhY3QubXlzcWwuZGV2ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3 +DQEBAQUAA0sAMEgCQQDhUjAs2b5kKJFdev3Z6RQ1etKUTpFG4Nufa3n0TKxuB2E0 +hnRip6hEr/qHh6h9QmH/q1DUe791+tXVs3T7Vh43AgMBAAGjgcowgccwHQYDVR0O +BBYEFFgwtZssBZQGuj088LLNHWdl43+FMIGXBgNVHSMEgY8wgYyAFFgwtZssBZQG +uj088LLNHWdl43+FoWmkZzBlMQswCQYDVQQGEwJTRTEQMA4GA1UECBMHVXBwc2Fs +YTERMA8GA1UEChMITXlTUUwgQUIxMTAvBgkqhkiG9w0BCQEWImFic3RyYWN0Lm15 +c3FsLmRldmVsb3BlckBteXNxbC5jb22CCQDLc0swoMv32TAMBgNVHRMEBTADAQH/ +MA0GCSqGSIb3DQEBBQUAA0EAWQcnEcM5sZxsmxKfyeFpMacQsftf4o2Dncjwi/8Q +7ro3RXX33ebUu/UTJ+yCLg2D9M7QBNuIIIDdbntOiPUV1Q== -----END CERTIFICATE----- diff --git a/mysql-test/std_data/server-cert.pem b/mysql-test/std_data/server-cert.pem index cab54db8b23..3781430c7f6 100644 --- a/mysql-test/std_data/server-cert.pem +++ b/mysql-test/std_data/server-cert.pem @@ -1,12 +1,13 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 1 (0x1) + Serial Number: + a9:86:f7:15:12:8e:ad:5d Signature Algorithm: sha1WithRSAEncryption - Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Issuer: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer@mysql.com Validity - Not Before: Jan 28 10:55:13 2009 GMT - Not After : Jan 28 10:55:13 2010 GMT + Not Before: Jan 26 22:31:45 2010 GMT + Not After : Jan 26 22:31:45 2011 GMT Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost/emailAddress=abstract.mysql.developer@mysql.com Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -19,37 +20,34 @@ Certificate: 8d:c3:04:98:27 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE X509v3 Subject Key Identifier: D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA X509v3 Authority Key Identifier: - keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF - DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB - serial:95:E9:78:F5:34:50:E4:D5 + keyid:D9:9A:B8:5F:22:EA:04:10:C8:25:7D:82:57:E6:2E:FD:19:29:E7:DA + DirName:/C=SE/ST=Uppsala/O=MySQL AB/CN=localhost/emailAddress=abstract.mysql.developer@mysql.com + serial:A9:86:F7:15:12:8E:AD:5D + X509v3 Basic Constraints: + CA:TRUE Signature Algorithm: sha1WithRSAEncryption - 54:07:2d:21:0b:a5:af:3b:58:23:32:5e:56:7f:ab:58:63:48: - 91:aa:38:90:89:16:f9:cc:bf:a4:0e:78:2b:9f:c5:1b:58:a6: - e6:08:8f:2e:ae:97:03:21:9b:f1:cd:c0:26:8f:1d:d7:28:27: - a0:8e:81:09:1b:1c:0f:c9:a5:41:3a:2d:44:3f:9c:fa:87:ff: - c8:4c:2b:44:f7:1b:c1:3e:4f:01:7f:e9:26:cc:9f:1c:06:b5: - 0b:27:d1:10:90:be:93:0c:9c:e7:b0:d1:ea:27:99:4e:06:14: - 0c:7a:e9:c1:52:c5:33:68:bc:61:0d:db:81:3b:57:48:57:bf: - 42:9a + 58:b5:de:24:8e:29:82:b1:57:23:c4:b4:1b:8c:a7:81:89:21: + 12:a4:a3:06:b8:ca:88:20:ad:53:27:fc:91:36:f3:f0:82:c6: + ca:05:49:03:44:90:51:54:f0:6f:94:0e:b5:05:31:b0:7e:61: + fb:ab:8b:02:5f:f8:f3:7e:28:9c -----BEGIN CERTIFICATE----- -MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ -MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT -UUwgQUIwHhcNMDkwMTI4MTA1NTEzWhcNMTAwMTI4MTA1NTEzWjB5MQswCQYDVQQG -EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV -BAMTCWxvY2FsaG9zdDExMC8GCSqGSIb3DQEJARYiYWJzdHJhY3QubXlzcWwuZGV2 -ZWxvcGVyQG15c3FsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC2j+W3tIaD -E4r5v2PLZC25UdHeq3tFH6q1ZnMT+aYH1bp8+pK9N+Kth9s+tmoSZPjuF+MVBi+o -gmi/V43DBJgnAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQU2Zq4XyLq -BBDIJX2CV+Yu/Rkp59owdAYDVR0jBG0wa4AU8uLqVWWkmuKsnZf1RWz294wRrd+h -SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV -cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAJXpePU0UOTVMA0GCSqGSIb3DQEB -BQUAA4GBAFQHLSELpa87WCMyXlZ/q1hjSJGqOJCJFvnMv6QOeCufxRtYpuYIjy6u -lwMhm/HNwCaPHdcoJ6COgQkbHA/JpUE6LUQ/nPqH/8hMK0T3G8E+TwF/6SbMnxwG -tQsn0RCQvpMMnOew0eonmU4GFAx66cFSxTNovGEN24E7V0hXv0Ka +MIICyjCCAnSgAwIBAgIJAKmG9xUSjq1dMA0GCSqGSIb3DQEBBQUAMHkxCzAJBgNV +BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjESMBAG +A1UEAxMJbG9jYWxob3N0MTEwLwYJKoZIhvcNAQkBFiJhYnN0cmFjdC5teXNxbC5k +ZXZlbG9wZXJAbXlzcWwuY29tMB4XDTEwMDEyNjIyMzE0NVoXDTExMDEyNjIyMzE0 +NVoweTELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNhbGExETAPBgNVBAoTCE15 +U1FMIEFCMRIwEAYDVQQDEwlsb2NhbGhvc3QxMTAvBgkqhkiG9w0BCQEWImFic3Ry +YWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb20wXDANBgkqhkiG9w0BAQEFAANL +ADBIAkEAto/lt7SGgxOK+b9jy2QtuVHR3qt7RR+qtWZzE/mmB9W6fPqSvTfirYfb +PrZqEmT47hfjFQYvqIJov1eNwwSYJwIDAQABo4HeMIHbMB0GA1UdDgQWBBTZmrhf +IuoEEMglfYJX5i79GSnn2jCBqwYDVR0jBIGjMIGggBTZmrhfIuoEEMglfYJX5i79 +GSnn2qF9pHsweTELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNhbGExETAPBgNV +BAoTCE15U1FMIEFCMRIwEAYDVQQDEwlsb2NhbGhvc3QxMTAvBgkqhkiG9w0BCQEW +ImFic3RyYWN0Lm15c3FsLmRldmVsb3BlckBteXNxbC5jb22CCQCphvcVEo6tXTAM +BgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA0EAWLXeJI4pgrFXI8S0G4yngYkh +EqSjBrjKiCCtUyf8kTbz8ILGygVJA0SQUVTwb5QOtQUxsH5h+6uLAl/4834onA== -----END CERTIFICATE----- diff --git a/mysql-test/std_data/server8k-cert.pem b/mysql-test/std_data/server8k-cert.pem index 3b86effd699..008876f6244 100644 --- a/mysql-test/std_data/server8k-cert.pem +++ b/mysql-test/std_data/server8k-cert.pem @@ -1,12 +1,13 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 4 (0x4) + Serial Number: + c8:e1:81:28:1d:a7:33:f4 Signature Algorithm: sha1WithRSAEncryption - Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB + Issuer: C=SE, ST=Uppsala, O=MySQL AB, CN=server Validity - Not Before: Jan 28 11:12:27 2009 GMT - Not After : Jan 28 11:12:27 2010 GMT + Not Before: Jan 26 22:31:07 2010 GMT + Not After : Jan 26 22:31:07 2011 GMT Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server Subject Public Key Info: Public Key Algorithm: rsaEncryption @@ -83,56 +84,124 @@ Certificate: 74:7f:17:57:d9 Exponent: 65537 (0x10001) X509v3 extensions: - X509v3 Basic Constraints: - CA:FALSE X509v3 Subject Key Identifier: 58:12:24:59:A7:3C:29:15:89:5A:C2:12:DB:E7:A5:42:10:21:B7:BA X509v3 Authority Key Identifier: - keyid:F2:E2:EA:55:65:A4:9A:E2:AC:9D:97:F5:45:6C:F6:F7:8C:11:AD:DF - DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB - serial:95:E9:78:F5:34:50:E4:D5 + keyid:58:12:24:59:A7:3C:29:15:89:5A:C2:12:DB:E7:A5:42:10:21:B7:BA + DirName:/C=SE/ST=Uppsala/O=MySQL AB/CN=server + serial:C8:E1:81:28:1D:A7:33:F4 + X509v3 Basic Constraints: + CA:TRUE Signature Algorithm: sha1WithRSAEncryption - cd:cb:5c:83:35:ea:cb:cb:c3:a8:c3:95:e2:e6:6f:4d:d8:e4: - ee:41:dd:3f:35:82:ac:2f:fd:63:89:4f:3a:19:d7:81:75:b3: - a3:fc:36:b2:12:d5:c6:56:bc:13:60:37:33:6e:a0:d8:ae:7c: - 88:f9:4b:ee:7b:1f:c8:f0:56:19:07:4d:bb:45:52:1c:78:81: - 07:7c:13:86:b8:86:70:85:e4:71:25:58:78:d1:be:de:22:82: - 6d:1a:4b:06:ac:f0:e8:50:87:c7:69:64:c2:61:43:cd:96:06: - a6:7e:09:a9:02:01:2a:a2:40:f3:cd:10:80:48:d0:34:55:40: - b9:ce + 99:ff:b3:de:74:25:33:32:d0:38:a4:a0:92:c7:ee:02:05:92: + 21:1b:65:27:81:63:d2:37:b6:de:cc:0c:a2:b1:a8:8d:0c:ce: + c3:e4:e4:74:18:bf:1f:6e:91:d2:58:34:4a:a5:23:0a:15:09: + 1f:5c:74:82:14:dd:08:3e:c0:ba:21:5c:15:3d:f9:1a:07:7f: + da:cc:d0:56:8c:d6:17:a8:f3:26:43:71:65:a9:94:08:25:04: + a8:6b:a8:27:32:90:90:2b:22:4c:4f:79:3f:81:09:42:86:67: + c3:f9:a8:b0:cc:ff:ed:8f:36:ac:57:ea:e2:f4:b6:9e:83:c1: + e6:cc:6b:f5:4e:28:3c:65:c3:8f:d6:ae:25:07:05:a0:ee:41: + 76:f7:52:05:ca:6b:68:d2:ef:74:d2:cc:a1:8a:46:7d:0d:50: + 34:62:72:76:a7:5d:4b:7a:87:e5:ed:97:b3:fb:75:14:ad:80: + 9e:1e:91:77:47:f2:8c:28:45:68:aa:f8:00:7c:be:72:d2:40: + 0e:b3:5a:33:ac:a5:3a:a8:f7:b5:4a:42:c6:60:83:f2:a8:74: + e4:b9:6b:28:f6:56:10:8c:74:0f:7d:f7:18:7b:31:38:3c:e7: + c0:17:62:d8:e6:88:79:5b:c3:1f:da:bc:85:01:6d:68:d7:b9: + 2b:95:03:0e:ba:07:e4:26:dd:89:09:40:38:4f:f6:95:97:41: + 0b:8b:78:a7:a2:aa:91:d5:73:a3:12:ce:b3:10:3a:be:d5:20: + 9b:87:b9:ad:ce:42:00:14:f7:8f:d0:41:75:e7:97:b8:79:92: + fe:a0:33:58:e9:ec:82:43:56:a7:f7:02:40:00:4e:b8:57:3c: + d1:1f:45:44:09:2d:83:c0:46:47:77:72:ff:1f:7d:31:78:67: + 03:eb:be:74:3e:15:17:59:3e:06:e5:08:61:70:03:41:4c:01: + 50:ef:53:04:5d:7f:c8:27:51:0f:7a:68:d4:a0:38:f6:7e:ab: + 7d:83:ee:b7:dd:83:f0:1a:11:d3:a0:f7:f1:23:8f:ad:ca:1a: + b3:eb:e4:e5:19:44:7e:cb:e3:97:df:3b:bb:89:36:f6:66:42: + 2e:ef:8f:81:db:59:89:a0:81:b6:02:78:c3:db:0a:07:82:36: + 08:b6:82:70:f4:b3:05:66:6e:e1:9f:69:89:b5:c8:12:9b:1c: + bc:b6:2c:3d:74:ae:d5:f8:56:ab:63:e6:bd:06:06:f5:5d:e6: + 25:df:7e:f9:ac:da:69:e6:a5:1b:78:2c:9a:3e:80:ea:1c:c9: + 16:5c:a6:39:f5:d1:d7:2c:c0:20:55:7c:77:a4:43:19:df:52: + c5:80:ff:aa:03:39:ea:2c:71:d9:88:b4:15:04:1a:47:b3:de: + 20:73:85:cd:9d:23:ed:98:06:21:19:0d:08:96:87:e7:a4:84: + a8:97:83:ed:ba:85:d6:60:6c:44:a6:c6:e5:6b:70:c8:83:2d: + f2:c7:ee:dd:96:14:4e:43:51:46:a2:74:c9:4d:35:5d:10:65: + b0:0f:3d:ed:b4:69:8b:a3:dd:23:e7:40:2e:13:58:f8:27:33: + 64:74:57:89:5e:9d:e0:6e:2f:50:e2:fa:d8:18:7f:9a:8e:6c: + aa:4a:fb:c8:9f:b6:78:11:cb:44:ca:7e:20:16:a0:2e:1e:18: + 7a:ac:70:2b:9c:c7:0e:bc:2e:c2:7f:de:b7:a2:0d:57:1a:10: + 05:60:7c:ca:51:7a:64:87:3d:84:29:3c:18:10:8c:9c:59:c1: + 99:e8:6f:2c:24:83:66:ab:bc:f6:eb:b0:e6:05:f5:da:eb:9d: + 85:ea:2c:81:cf:4f:bb:55:4e:70:fb:a0:68:ac:d7:5f:ae:15: + dd:a7:48:63:f0:05:47:a4:f9:cc:32:9a:20:b9:05:32:3a:fe: + fd:75:18:37:49:36:0d:77:cb:bd:64:08:09:0c:9c:6e:4e:71: + 1f:49:6b:11:b6:87:c5:72:3c:d4:9f:a6:06:44:57:b7:42:64: + c1:85:82:5b:44:a3:bb:2b:f8:53:e4:6f:e8:ae:10:db:b9:c3: + 0c:76:01:e9:0f:d5:63:b3:ab:7b:bd:04:26:2c:8f:c4:99:76: + eb:1e:03:0c:e2:b3:cc:69:8d:64:51:2e:a6:d0:f6:50:1e:c1: + f9:b7:f2:d1:6e:6a:3d:3b:d4:a2:72:4f:95:35:ff:c7:52:0f: + fb:11:a9:a7:4c:35:d8:d7:43:98:ff:b1:b9:e4:54:29:7a:d4: + 98:70:51:f8:e0:dc:66:e1:ef:f0:70:57:08:13:82:5c:4c:48: + 91:4f:a7:04:54:6d:eb:27:92:45:40:51:28:6d:a5:29:4a:33: + b3:04:d0:67:d8:35:9c:d4:b2:e0:b0:e7:a3:3a:f4:34:7f:e7: + 7d:d7:42:86:a6:a0:07:7e:3b:de:e3:6f:a0:76:19:f1:70:ea: + 71:af:c4:d3:42:48:c5:fd:3d:2f:20:37:77:7f:e7:23:53:e2: + 23:dc:1f:0e:f6:91:66:a3:6c:82:9d:fd:e5:39:eb:13:9c:9e: + ae:90:45:92:8f:db:f3:7a:3d:9a:86:ba:12:06:43:66:58:df: + fa:92:c8:b8:d7:b7:57:ff:2b:37:71:f0:d1:60:69:9b:58:a3: + 91:64:d3:27:cf:d3:83:f7:53:39:9c:03:d9:a5:f1:16:df:a3: + 03:28:8b:ef:3d:7c:c8:af:50:3b:21:85:33:2e:c5:f1 -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- From a0417475678013914fb91c44be279b4107e3ffdb Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Thu, 28 Jan 2010 16:49:14 +0200 Subject: [PATCH 2/2] Fixed compiler warnings & failing test cases When compiling with debug, don't clear buffer in 'net_clear()' - This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap client/mysqltest.cc: Fixed compiler warning mysql-test/t/partition_innodb_semi_consistent.test: Added missing --reap (fixes random failure) sql/net_serv.cc: When compiling with debug, don't clear buffer in 'net_clear()' - This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap storage/myisam/ft_boolean_search.c: Fixed compiler warnings storage/myisam/ft_parser.c: Fixed compiler warnings storage/myisam/ft_stopwords.c: Fixed compiler warnings support-files/compiler_warnings.supp: Added a lot of new suppression of not relevant warnings and warnings in systems we are not in charge of unittest/mysys/waiting_threads-t.c: Fixed compiler warnings --- client/mysqltest.cc | 4 +++- mysql-test/t/partition_innodb_semi_consistent.test | 1 + sql/net_serv.cc | 7 ++++++- storage/myisam/ft_boolean_search.c | 6 +++--- storage/myisam/ft_parser.c | 6 +++--- storage/myisam/ft_stopwords.c | 8 ++++---- support-files/compiler_warnings.supp | 10 ++++++++++ unittest/mysys/waiting_threads-t.c | 2 +- 8 files changed, 31 insertions(+), 13 deletions(-) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index bc5c4ed76b8..891dd72edfa 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -657,7 +657,9 @@ public: } while ((bytes= fread(buf, 1, sizeof(buf), m_file)) > 0) - fwrite(buf, 1, bytes, stderr); + if (fwrite(buf, 1, bytes, stderr)) + die("Failed to write to '%s', errno: %d", + m_file_name, errno); if (!lines) { diff --git a/mysql-test/t/partition_innodb_semi_consistent.test b/mysql-test/t/partition_innodb_semi_consistent.test index 6a6a7cf958e..5eda2f142c6 100644 --- a/mysql-test/t/partition_innodb_semi_consistent.test +++ b/mysql-test/t/partition_innodb_semi_consistent.test @@ -187,6 +187,7 @@ SELECT * FROM t1; --echo # Switch to connection con2 connection con2; +--reap SELECT * FROM t1; connection default; diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 73892f31ccf..f987067b9b3 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -286,7 +286,12 @@ void net_clear(NET *net, my_bool clear_buffer) #endif DBUG_ENTER("net_clear"); -#if !defined(EMBEDDED_LIBRARY) +/* + We don't do a clear in case of DBUG_OFF to catch bugs + in the protocol handling +*/ + +#if !defined(EMBEDDED_LIBRARY) && defined(DBUG_OFF) if (clear_buffer) { while ((ready= net_data_is_ready(net->vio->sd)) > 0) diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c index ae494cda385..3cc47576827 100644 --- a/storage/myisam/ft_boolean_search.c +++ b/storage/myisam/ft_boolean_search.c @@ -321,7 +321,7 @@ static int _ftb_parse_query(FTB *ftb, uchar *query, mysql_ft_size_t len, param->mysql_add_word= ftb_query_add_word; param->mysql_ftparam= (void *)&ftb_param; param->cs= ftb->charset; - param->doc= (char*) query; + param->doc= query; param->length= len; param->flags= 0; param->mode= MYSQL_FTPARSER_FULL_BOOLEAN_INFO; @@ -702,7 +702,7 @@ static int _ftb_check_phrase(FTB *ftb, const uchar *document, param->mysql_add_word= ftb_phrase_add_word; param->mysql_ftparam= (void *)&ftb_param; param->cs= ftb->charset; - param->doc= (char *) document; + param->doc= document; param->length= len; param->flags= 0; param->mode= MYSQL_FTPARSER_WITH_STOPWORDS; @@ -1000,7 +1000,7 @@ float ft_boolean_find_relevance(FT_INFO *ftb, uchar *record, uint length) { if (!ftsi.pos) continue; - param->doc= (char *)ftsi.pos; + param->doc= ftsi.pos; param->length= ftsi.len; if (unlikely(parser->parse(param))) return 0; diff --git a/storage/myisam/ft_parser.c b/storage/myisam/ft_parser.c index f585038f0b8..3c3efbf0906 100644 --- a/storage/myisam/ft_parser.c +++ b/storage/myisam/ft_parser.c @@ -175,7 +175,7 @@ uchar ft_get_word(CHARSET_INFO *cs, const uchar **start, const uchar *end, if ((param->trunc=(doc= ft_min_word_len && !is_stopword((char*) word->pos, + if (((length >= ft_min_word_len && !is_stopword(word->pos, word->len)) || param->trunc) && length < ft_max_word_len) { @@ -298,7 +298,7 @@ static int ft_parse_internal(MYSQL_FTPARSER_PARAM *param, DBUG_ENTER("ft_parse_internal"); while (ft_simple_get_word(wtree->custom_arg, &doc, end, &w, TRUE)) - if (param->mysql_add_word(param, (char*) w.pos, w.len, 0)) + if (param->mysql_add_word(param, w.pos, w.len, 0)) DBUG_RETURN(1); DBUG_RETURN(0); } @@ -319,7 +319,7 @@ int ft_parse(TREE *wtree, const uchar *doc, mysql_ft_size_t doclen, param->mysql_add_word= ft_add_word; param->mysql_ftparam= &my_param; param->cs= wtree->custom_arg; - param->doc= (char*) doc; + param->doc= doc; param->length= doclen; param->mode= MYSQL_FTPARSER_SIMPLE_MODE; DBUG_RETURN(parser->parse(param)); diff --git a/storage/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c index 9544c577c70..5e550b9dff5 100644 --- a/storage/myisam/ft_stopwords.c +++ b/storage/myisam/ft_stopwords.c @@ -20,7 +20,7 @@ typedef struct st_ft_stopwords { - const char * pos; + const uchar* pos; size_t len; } FT_STOPWORD; @@ -30,15 +30,15 @@ static int FT_STOPWORD_cmp(void* cmp_arg __attribute__((unused)), FT_STOPWORD *w1, FT_STOPWORD *w2) { return ha_compare_text(default_charset_info, - (uchar *)w1->pos,w1->len, - (uchar *)w2->pos,w2->len,0,0); + w1->pos, w1->len, + w2->pos, w2->len, 0, 0); } static void FT_STOPWORD_free(FT_STOPWORD *w, TREE_FREE action, void *arg __attribute__((unused))) { if (action == free_free) - my_free((uchar*) w->pos, MYF(0)); + my_free((void*) w->pos, MYF(0)); } static int ft_add_stopword(const char *w) diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 9fef92a5f5e..7911d91928b 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -4,6 +4,7 @@ # integer.cpp: .*control reaches end of non-void function.*: 1288-1427 +integer.cpp: .*no return statement in function returning non-void.*: 1288-1427 DictTabInfo.cpp : .*invalid access to non-static.* DictTabInfo.cpp : .*macro was used incorrectly.* DbdihMain.cpp : .*unused variable.* : 6666-7013 @@ -27,13 +28,17 @@ _flex_tmp.c: .*not enough actual parameters for macro 'yywrap'.* pars0lex.l: .*conversion from 'ulint' to 'int', possible loss of data.* btr/btr0cur\.c: .*value computed is not used.*: 3175-3375 include/buf0buf\.ic: unused parameter ‘mtr’ +fil/fil0fil\.c: pointer targets in passing argument.*differ in signedness fil/fil0fil\.c: comparison between signed and unsigned : 3100-3199 fil/fil0fil\.c: unused parameter log/log0recv\.c: unused variable os/os0file\.c: unused parameter +os/os0file\.c: pointer targets in assignment differ in signedness handler/i_s\.cc: unused variable sync/sync0rw\.c: unused parameter sync/sync0sync\.c: unused parameter +sync/sync0sync\.c: unused variable +ut/ut0ut\.c: ignoring return value of # # bdb is not critical to keep up to date @@ -98,10 +103,15 @@ storage/maria/ma_pagecache.c: .*'info_check_pin' defined but not used # I think these are due to mix of C and C++. # storage/pbxt/ : typedef.*was ignored in this declaration +ha_pbxt\.cc : variable.*might be clobbered by.*longjmp # # Yassl include/runtime.hpp: .*pure_error.* +.*/extra/yassl/taocrypt/.*: comparison with string literal +.*/extra/yassl/taocrypt/src/blowfish\.cpp: array subscript is above array bounds +.*/extra/yassl/taocrypt/src/file\.cpp: ignoring return value +.*/extra/yassl/taocrypt/src/integer\.cpp: control reaches end of non-void function # # Groff warnings on OpenSUSE. diff --git a/unittest/mysys/waiting_threads-t.c b/unittest/mysys/waiting_threads-t.c index d6c8dc31025..79dee219efb 100644 --- a/unittest/mysys/waiting_threads-t.c +++ b/unittest/mysys/waiting_threads-t.c @@ -258,7 +258,7 @@ void do_tests() #define test_kill_strategy(X) \ diag("kill strategy: " #X); \ DBUG_EXECUTE("reset_file", \ - { rewind(DBUG_FILE); ftruncate(fileno(DBUG_FILE), 0); }); \ + { rewind(DBUG_FILE); (void) ftruncate(fileno(DBUG_FILE), 0); }); \ DBUG_PRINT("info", ("kill strategy: " #X)); \ kill_strategy=X; \ do_one_test();