more fixes for test cases

mysql-test/suite/innodb/include/restart_and_reinit.inc: drop and recreate mysql.innodb* tables when deleting innodb table spaces mysql-test/t/ssl_8k_key-master.opt: with loose- prefix ssl errors are ignored sql-common/client.c: compiler warnings sql/field.cc: use the new function sql/item.cc: don't convert time to double or decimal via longlong, this loses sub-second part. Use dedicated functions. sql/item.h: incorrect cast_to_int type for params sql/item_strfunc.cc: use the new function sql/lex.h: unused sql/my_decimal.h: helper macro sql/sql_plugin.cc: workaround for a compiler warning sql/sql_yacc.yy: unused sql/transaction.cc: fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag storage/sphinx/CMakeLists.txt: compiler warnings
author: Sergei Golubchik <sergii@pisem.net> 2012-10-01 13:15:29 +0200
committer: Sergei Golubchik <sergii@pisem.net> 2012-10-01 13:15:29 +0200
commit: 416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch)
tree: 5244b83a9f22d4d5899154c9a64a316111bbe6b6 /mysql-test
parent: adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff)
download: mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz
33 files changed, 305 insertions, 122 deletions
diff --git a/mysql-test/disabled.def b/mysql-test/disabled.def
index 37b4626e6db..46e20f86ec3 100644
--- a/mysql-test/disabled.def
+++ b/mysql-test/disabled.def
@@ -17,3 +17,6 @@ sum_distinct-big         : Bug#11764126 2010-11-15 mattiasj was not tested
 archive-big              : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc
 log_tables-big           : Bug#11756699 2010-11-15 mattiasj report already exists
 mysql_embedded           : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836
+ssl_crl_clients_valid    : broken upstream
+ssl_crl                  : broken upstream
+ssl_crl_clrpath          : broken upstream
diff --git a/mysql-test/include/have_openssl.inc b/mysql-test/include/have_openssl.inc
index e240d935cb2..c9260123f9d 100644
--- a/mysql-test/include/have_openssl.inc
+++ b/mysql-test/include/have_openssl.inc
@@ -1,4 +1,7 @@
--- require r/openssl.require
-disable_query_log;
-show variables like "have_openssl";
-enable_query_log;
+-- source include/have_ssl_communication.inc
+let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
+if (!$crllen)
+{
+  skip Needs OpenSSL;
+}
+
diff --git a/mysql-test/include/have_ssl.inc b/mysql-test/include/have_ssl.inc
deleted file mode 100644
index 6f2d5587a75..00000000000
--- a/mysql-test/include/have_ssl.inc
+++ /dev/null
@@ -1,4 +0,0 @@
--- require r/have_ssl.require
-disable_query_log;
-show variables like 'have_ssl';
-enable_query_log;
diff --git a/mysql-test/include/have_ssl_communication.inc b/mysql-test/include/have_ssl_communication.inc
index 6f2d5587a75..84278e7288a 100644
--- a/mysql-test/include/have_ssl_communication.inc
+++ b/mysql-test/include/have_ssl_communication.inc
@@ -1,4 +1,4 @@
--- require r/have_ssl.require
-disable_query_log;
-show variables like 'have_ssl';
-enable_query_log;
+if (`SELECT count(*) = 0 FROM information_schema.GLOBAL_VARIABLES WHERE
+      VARIABLE_NAME = 'have_ssl' AND VARIABLE_VALUE = 'YES'`){
+  skip Needs SSL;
+}
diff --git a/mysql-test/include/have_ssl_crypto_functs.inc b/mysql-test/include/have_ssl_crypto_functs.inc
index d32f059e4fa..2204c81db39 100644
--- a/mysql-test/include/have_ssl_crypto_functs.inc
+++ b/mysql-test/include/have_ssl_crypto_functs.inc
@@ -1,8 +1,4 @@
--- require r/have_ssl_is_yes_or_disabled_only.require
-disable_query_log;
-# "yes" means that the ssl library is found and the server can communicate using SSL.
-# "no" means that there are no SSL functions in the server.
-# "disabled" means that ssl functions exist, but communication is disabled for some reason.
-replace_regex s/(YES|DISABLED)/yesordisabled/;
-show variables like "have_ssl";
-enable_query_log;
+if (`SELECT count(*) = 0 FROM information_schema.GLOBAL_VARIABLES WHERE
+      VARIABLE_NAME = 'have_ssl' AND VARIABLE_VALUE <> 'NO'`){
+  skip Needs SSL;
+}
diff --git a/mysql-test/r/bug58669.result b/mysql-test/r/bug58669.result
index cf4eeeb02a1..c9bd43e244b 100644
--- a/mysql-test/r/bug58669.result
+++ b/mysql-test/r/bug58669.result
@@ -8,10 +8,9 @@ CREATE TABLE db1.t1(a INT);
 SELECT CURRENT_USER();
 CURRENT_USER()
 user1@localhost
-SHOW VARIABLES LIKE "%read_only%";
+SHOW VARIABLES LIKE "read_only%";
 Variable_name	Value
 read_only	ON
-tx_read_only	OFF
 INSERT INTO db1.t1 VALUES (1);
 ERROR HY000: The MariaDB server is running with the --read-only option so it cannot execute this statement
 DROP DATABASE db1;
diff --git a/mysql-test/r/have_ssl.require b/mysql-test/r/have_ssl.require
deleted file mode 100644
index 9bdffdf0c13..00000000000
--- a/mysql-test/r/have_ssl.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-have_ssl	YES
diff --git a/mysql-test/r/have_ssl_is_yes_or_disabled_only.require b/mysql-test/r/have_ssl_is_yes_or_disabled_only.require
deleted file mode 100644
index dfd6d2dad01..00000000000
--- a/mysql-test/r/have_ssl_is_yes_or_disabled_only.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-have_ssl	yesordisabled
diff --git a/mysql-test/r/openssl.require b/mysql-test/r/openssl.require
deleted file mode 100644
index dae48a472b5..00000000000
--- a/mysql-test/r/openssl.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-have_openssl	YES
diff --git a/mysql-test/std_data/crl-ca-cert.pem b/mysql-test/std_data/crl-ca-cert.pem
new file mode 100644
index 00000000000..abe7bc469fc
--- /dev/null
+++ b/mysql-test/std_data/crl-ca-cert.pem
@@ -0,0 +1,63 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            a5:85:ec:60:b1:68:44:22
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Validity
+            Not Before: Jun 17 07:27:51 2011 GMT
+            Not After : Jun 15 07:27:51 2016 GMT
+        Subject: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:9b:08:0b:96:19:57:fb:21:79:f4:16:c9:b8:2c:
+                    13:2e:e1:fe:5f:6b:18:7d:d4:c4:d7:cd:66:a6:62:
+                    0e:b7:28:b1:39:76:62:6e:5a:4a:80:f6:0e:8e:84:
+                    3e:cf:2f:91:0d:36:6d:8b:b5:f9:78:96:f0:5f:82:
+                    a2:b2:d8:fc:b3:46:b5:30:24:b3:a8:77:60:6c:05:
+                    c9:8f:82:fd:ad:9f:26:23:29:56:5b:02:6f:f2:00:
+                    31:86:60:b7:8c:56:b3:95:a8:8d:a9:bb:6b:91:fd:
+                    5d:f5:6a:21:45:85:63:78:0e:0f:0e:03:6d:53:73:
+                    0d:6c:aa:5b:f9:fc:fa:fd:f7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+            X509v3 Authority Key Identifier: 
+                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+                DirName:/C=BG/ST=Plovdiv/O=Oracle/OU=MySQL/CN=MySQL CRL test CA certificate
+                serial:A5:85:EC:60:B1:68:44:22
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        73:dd:2e:76:71:25:c2:fe:7a:c5:46:ca:f2:c7:a0:43:f0:c7:
+        3c:24:8d:a6:bd:8d:f2:7c:db:03:1b:2b:8a:c8:23:ae:ef:71:
+        25:33:5b:10:61:e7:7d:89:30:a8:67:25:2e:e0:06:30:77:da:
+        b8:87:e5:91:cd:c7:8f:c9:7b:3d:9e:86:80:44:02:6b:d1:06:
+        85:5d:28:78:cc:a7:a8:35:ac:f7:77:6d:e2:c7:a3:37:bc:9f:
+        d3:bf:4a:ca:09:dc:d0:78:0c:59:c7:db:4b:67:f1:09:6d:a9:
+        7a:50:2f:1d:2c:a6:b8:81:0e:e6:4b:ee:d9:be:ae:a5:6a:d7:
+        56:c4
+-----BEGIN CERTIFICATE-----
+MIIDHDCCAoWgAwIBAgIJAKWF7GCxaEQiMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
+BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
+ZTAeFw0xMTA2MTcwNzI3NTFaFw0xNjA2MTUwNzI3NTFaMGgxCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNVBAsTBU15
+U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0ZTCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmwgLlhlX+yF59BbJuCwTLuH+X2sYfdTE
+181mpmIOtyixOXZiblpKgPYOjoQ+zy+RDTZti7X5eJbwX4Kistj8s0a1MCSzqHdg
+bAXJj4L9rZ8mIylWWwJv8gAxhmC3jFazlaiNqbtrkf1d9WohRYVjeA4PDgNtU3MN
+bKpb+fz6/fcCAwEAAaOBzTCByjAdBgNVHQ4EFgQUxB0saD9fKVHsxVRhzhYT0nJd
+Y+gwgZoGA1UdIwSBkjCBj4AUxB0saD9fKVHsxVRhzhYT0nJdY+ihbKRqMGgxCzAJ
+BgNVBAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAM
+BgNVBAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZp
+Y2F0ZYIJAKWF7GCxaEQiMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA
+c90udnElwv56xUbK8segQ/DHPCSNpr2N8nzbAxsrisgjru9xJTNbEGHnfYkwqGcl
+LuAGMHfauIflkc3Hj8l7PZ6GgEQCa9EGhV0oeMynqDWs93dt4sejN7yf079Kygnc
+0HgMWcfbS2fxCW2pelAvHSymuIEO5kvu2b6upWrXVsQ=
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-client-cert.pem b/mysql-test/std_data/crl-client-cert.pem
new file mode 100644
index 00000000000..260e8bf4647
--- /dev/null
+++ b/mysql-test/std_data/crl-client-cert.pem
@@ -0,0 +1,62 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            a5:85:ec:60:b1:68:44:24
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Validity
+            Not Before: Jun 17 07:32:32 2011 GMT
+            Not After : Jun 16 07:32:32 2014 GMT
+        Subject: C=BG, ST=Plovdiv, L=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test client certificate
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:bd:18:bf:c5:37:7e:f7:8a:1d:22:c0:4f:5a:70:
+                    51:ea:df:56:4f:29:e9:c7:a5:8a:ab:5a:48:b5:f9:
+                    bf:cd:2a:73:f8:fa:13:20:fd:33:17:11:93:51:f0:
+                    4f:fa:a5:6a:bc:37:94:92:de:7d:c1:09:c6:43:c0:
+                    f7:cd:dd:ac:06:bf:fe:0c:9f:fc:ec:5b:83:a1:1e:
+                    34:d8:af:50:17:4d:84:51:20:44:76:81:d1:12:76:
+                    06:fb:05:29:59:47:0f:9d:97:f1:41:2f:92:0d:e4:
+                    b6:c1:fb:cf:75:95:a9:0f:cf:b3:4f:69:a3:d1:14:
+                    e9:6b:cf:be:53:bd:4e:3f:5d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                39:37:9C:0B:9F:E4:8E:48:48:71:23:2B:CA:F0:C1:F9:0B:F2:0A:D0
+            X509v3 Authority Key Identifier: 
+                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+
+    Signature Algorithm: sha1WithRSAEncryption
+        18:03:42:13:af:86:c3:eb:9c:40:4a:d8:9e:e7:25:e1:43:7b:
+        2f:55:1b:e6:ec:bf:9b:56:b3:c7:cb:78:cd:d2:00:46:39:96:
+        d8:f8:cd:9d:0e:e7:97:51:93:f8:5b:ed:4f:5a:16:6b:56:fb:
+        c0:d1:58:3c:7f:e9:64:aa:11:03:ff:3b:5e:9d:6d:c8:53:a8:
+        4a:30:f7:a6:ae:7c:e0:ed:16:c4:a0:07:9c:75:1a:23:58:13:
+        70:9e:aa:cc:b8:1d:70:26:85:ad:e1:f3:34:83:1b:e0:72:44:
+        c4:28:d5:c5:6a:43:83:47:fe:8b:ab:ac:07:55:ff:2c:d9:0f:
+        5f:c7
+-----BEGIN CERTIFICATE-----
+MIIC3zCCAkigAwIBAgIJAKWF7GCxaEQkMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
+BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
+ZTAeFw0xMTA2MTcwNzMyMzJaFw0xNDA2MTYwNzMyMzJaMH4xCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MRAwDgYDVQQHEwdQbG92ZGl2MQ8wDQYDVQQKEwZP
+cmFjbGUxDjAMBgNVBAsTBU15U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBj
+bGllbnQgY2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL0Y
+v8U3fveKHSLAT1pwUerfVk8p6celiqtaSLX5v80qc/j6EyD9MxcRk1HwT/qlarw3
+lJLefcEJxkPA983drAa//gyf/Oxbg6EeNNivUBdNhFEgRHaB0RJ2BvsFKVlHD52X
+8UEvkg3ktsH7z3WVqQ/Ps09po9EU6WvPvlO9Tj9dAgMBAAGjezB5MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBQ5N5wLn+SOSEhxIyvK8MH5C/IK0DAfBgNVHSMEGDAWgBTEHSxo
+P18pUezFVGHOFhPScl1j6DANBgkqhkiG9w0BAQUFAAOBgQAYA0ITr4bD65xAStie
+5yXhQ3svVRvm7L+bVrPHy3jN0gBGOZbY+M2dDueXUZP4W+1PWhZrVvvA0Vg8f+lk
+qhED/ztenW3IU6hKMPemrnzg7RbEoAecdRojWBNwnqrMuB1wJoWt4fM0gxvgckTE
+KNXFakODR/6Lq6wHVf8s2Q9fxw==
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-client-key.pem b/mysql-test/std_data/crl-client-key.pem
new file mode 100644
index 00000000000..dea4a9cea56
--- /dev/null
+++ b/mysql-test/std_data/crl-client-key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQC9GL/FN373ih0iwE9acFHq31ZPKenHpYqrWki1+b/NKnP4+hMg
+/TMXEZNR8E/6pWq8N5SS3n3BCcZDwPfN3awGv/4Mn/zsW4OhHjTYr1AXTYRRIER2
+gdESdgb7BSlZRw+dl/FBL5IN5LbB+891lakPz7NPaaPRFOlrz75TvU4/XQIDAQAB
+AoGAYMe37rIWk47mlpCijIEMDA++Vsn20q2RKV4N9MUcO19M99LV036DlXzzT26V
+II1k8Wvo6Lpi1lewV6D9symPDwuxO3L/lSwInVSbAaCkRYq7BlpL+ShxsUpWT788
+ealwFTj3TeM1MCHpFwvO0xGBqFVk+ZadCNZjvwdQi44JCykCQQDqJgOTPPniq5Lk
+J6d+KWiCPVAEnEWk5lR0jQ2NZhSm4fFmCd0v6bNYhztk7dizSOiIrXnPLXx9Z8v0
+rwKr5WrHAkEAzr5ps9d/t4V60vAJCK+Sq1b+Qj42yEnH2eIjKAUFO63jkPtpOv9h
+nzYJTqajvEkHbYJ92elpzGx47FuSOjzAuwJAYpZC5xnDdSccoCf6I+q3cC70pBxQ
+TpAUe0ZwsFqM039KrtX0ZZoWw22dGm/yz/ogvnucUBks03iCrbGKhGoCPQJAdlhj
+U5I5Rsl+vH6w/Srbz37Vvv+0BkTNxPiA3Wi6TSZGDPkNjLshm6yn+UDEm4RGXzaC
+ahoF+QHi2pG0i+e4/wJBAOmbrYbjE2LAzIBy0NvRHslPABTK4zn1L9lzU5XIjV9r
+y8JiMfGNC5r7To/ERlFUlMbaPA5Zm9XNrZhDROMZLTc=
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/std_data/crl-server-cert.pem b/mysql-test/std_data/crl-server-cert.pem
new file mode 100644
index 00000000000..312bce0e0b6
--- /dev/null
+++ b/mysql-test/std_data/crl-server-cert.pem
@@ -0,0 +1,62 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            a5:85:ec:60:b1:68:44:23
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=BG, ST=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test CA certificate
+        Validity
+            Not Before: Jun 17 07:29:11 2011 GMT
+            Not After : Jun 16 07:29:11 2014 GMT
+        Subject: C=BG, ST=Plovdiv, L=Plovdiv, O=Oracle, OU=MySQL, CN=MySQL CRL test server certificate
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:c4:c6:01:29:db:e6:62:40:07:bd:43:ce:37:8e:
+                    90:0e:3c:86:cc:6a:0c:40:8e:8e:30:27:f2:84:d3:
+                    59:e8:7d:e7:97:1e:0d:36:08:0b:cc:28:bb:86:b0:
+                    0a:64:8c:55:33:f6:ce:19:00:08:b9:93:ca:84:7e:
+                    9a:4e:81:91:e2:56:32:2a:de:b5:1f:82:b9:8f:33:
+                    f4:87:f8:10:84:69:69:9a:79:58:08:9a:29:dc:09:
+                    79:27:90:ec:af:c8:2d:5f:2e:c1:e1:4a:f1:52:21:
+                    37:58:d4:f9:ef:49:ce:a9:9d:eb:dc:f4:34:30:40:
+                    d0:d7:38:54:94:2e:d1:ac:25
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                4A:18:8F:0C:A3:CF:D7:4A:38:83:07:FC:26:E3:EB:96:32:73:FA:8C
+            X509v3 Authority Key Identifier: 
+                keyid:C4:1D:2C:68:3F:5F:29:51:EC:C5:54:61:CE:16:13:D2:72:5D:63:E8
+
+    Signature Algorithm: sha1WithRSAEncryption
+        61:74:cc:62:70:9e:1f:3e:96:ac:cd:54:4f:34:60:1c:27:51:
+        f4:d5:f8:2e:d7:18:11:86:4e:b5:52:8c:a1:ef:28:c9:43:d7:
+        23:2a:22:15:4a:a3:e7:ff:76:fa:25:be:ed:30:05:ea:12:aa:
+        3f:c8:ab:a7:22:02:ea:cf:50:d4:43:31:5f:51:de:4c:e1:fa:
+        31:ba:2e:4e:d8:a4:3d:80:ad:17:83:67:0f:1b:6f:0b:74:43:
+        ce:36:cb:2f:17:9e:6e:ae:c6:eb:ec:93:70:69:82:42:04:b3:
+        a7:31:1f:65:70:ff:06:ce:9c:22:8a:dc:7d:92:bc:04:24:ca:
+        20:66
+-----BEGIN CERTIFICATE-----
+MIIC3zCCAkigAwIBAgIJAKWF7GCxaEQjMA0GCSqGSIb3DQEBBQUAMGgxCzAJBgNV
+BAYTAkJHMRAwDgYDVQQIEwdQbG92ZGl2MQ8wDQYDVQQKEwZPcmFjbGUxDjAMBgNV
+BAsTBU15U1FMMSYwJAYDVQQDEx1NeVNRTCBDUkwgdGVzdCBDQSBjZXJ0aWZpY2F0
+ZTAeFw0xMTA2MTcwNzI5MTFaFw0xNDA2MTYwNzI5MTFaMH4xCzAJBgNVBAYTAkJH
+MRAwDgYDVQQIEwdQbG92ZGl2MRAwDgYDVQQHEwdQbG92ZGl2MQ8wDQYDVQQKEwZP
+cmFjbGUxDjAMBgNVBAsTBU15U1FMMSowKAYDVQQDEyFNeVNRTCBDUkwgdGVzdCBz
+ZXJ2ZXIgY2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMTG
+ASnb5mJAB71DzjeOkA48hsxqDECOjjAn8oTTWeh955ceDTYIC8wou4awCmSMVTP2
+zhkACLmTyoR+mk6BkeJWMiretR+CuY8z9If4EIRpaZp5WAiaKdwJeSeQ7K/ILV8u
+weFK8VIhN1jU+e9Jzqmd69z0NDBA0Nc4VJQu0awlAgMBAAGjezB5MAkGA1UdEwQC
+MAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRl
+MB0GA1UdDgQWBBRKGI8Mo8/XSjiDB/wm4+uWMnP6jDAfBgNVHSMEGDAWgBTEHSxo
+P18pUezFVGHOFhPScl1j6DANBgkqhkiG9w0BAQUFAAOBgQBhdMxicJ4fPpaszVRP
+NGAcJ1H01fgu1xgRhk61Uoyh7yjJQ9cjKiIVSqPn/3b6Jb7tMAXqEqo/yKunIgLq
+z1DUQzFfUd5M4foxui5O2KQ9gK0Xg2cPG28LdEPONssvF55ursbr7JNwaYJCBLOn
+MR9lcP8Gzpwiitx9krwEJMogZg==
+-----END CERTIFICATE-----
diff --git a/mysql-test/std_data/crl-server-key.pem b/mysql-test/std_data/crl-server-key.pem
new file mode 100644
index 00000000000..fa8a61695c1
--- /dev/null
+++ b/mysql-test/std_data/crl-server-key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDExgEp2+ZiQAe9Q843jpAOPIbMagxAjo4wJ/KE01nofeeXHg02
+CAvMKLuGsApkjFUz9s4ZAAi5k8qEfppOgZHiVjIq3rUfgrmPM/SH+BCEaWmaeVgI
+mincCXknkOyvyC1fLsHhSvFSITdY1PnvSc6pnevc9DQwQNDXOFSULtGsJQIDAQAB
+AoGAfecnZW4jWegYS5xv/RJF0CYgJfkQv9m21s8omJ5W37B3lzSORW0eh1Hkswg+
+jhlQhwA63Lot2vfaU65h8ytqeGSxUSj0X8bVCsG+7aoQOxeowZs+CLgWPHmXbXw8
+BI9mFbfkIQ/1x5yMSTv0BNRGUtg+t5FGPsmWxSUtfTme4CECQQDxQGEoesrJ25uE
+MUcrTSeVpNmzqA8e41+8YIzbyi8nmwzp5gbsgIIF6/P5iMo1T7nIal/8N+FQMft4
+Ebzb0ZFNAkEA0M2JmH/ctyDQ7RbQx5lVwiHYn9a3inusvsV47kfH24kdRZYSymI8
+of7O8SGkHFJNeYsJmM3UrsNDlbSd+sCaOQJBAKoM+i8hVp2weU9VuNex28wkVfvH
+41ifZtUOrVsjidd9+D1KkejUsFHiPqfOntGzL74wFRZggSYZBStePWQotSUCQH29
+aMDnLtkw79/2v1+TnSs9CqCmwvyoIYz4iiykGVzBI1mGWGZ75ht/wMtBAPz1Kyao
+be0Q9qUPfaGnlQMt/TECQGrMh32zFPFR98yNS6JDVAVib+d5SaJsV5HXXqKCYxQR
+u1sv7YeF4/Y+TPKpBSasDNZHQ3zex0M9YOgI+9eEBHk=
+-----END RSA PRIVATE KEY-----
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 567ce3a3982..43eb4f235e3 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -25,7 +25,7 @@ sub skip_combinations {
              unless defined $::mysqld_variables{'debug-dbug'};
 
   $skip{'include/have_ssl_communication.inc'} =
-  $skip{'include/have_ssl.inc'} = 'Requires SSL'
+  $skip{'include/have_ssl_crypto_functs.inc'} = 'Requires SSL'
              unless defined $::mysqld_variables{'ssl-ca'};
 
   $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS;
diff --git a/mysql-test/suite/innodb/include/restart_and_reinit.inc b/mysql-test/suite/innodb/include/restart_and_reinit.inc
index 0f8c1f913d0..207e9c5dc6e 100644
--- a/mysql-test/suite/innodb/include/restart_and_reinit.inc
+++ b/mysql-test/suite/innodb/include/restart_and_reinit.inc
@@ -5,6 +5,12 @@
 #
 source include/not_embedded.inc;
 
+--disable_query_log
+let $innodb_index_stats = query_get_value(show create table mysql.innodb_index_stats, Create Table, 1);
+let $innodb_table_stats = query_get_value(show create table mysql.innodb_table_stats, Create Table, 1);
+let $database=`select database()`;
+drop table mysql.innodb_index_stats, mysql.innodb_table_stats;
+
 let $_server_id= `SELECT @@server_id`;
 let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect;
 let $datadir= `SELECT @@datadir`;
@@ -18,3 +24,9 @@ enable_reconnect;
 source include/wait_until_connected_again.inc;
 disable_reconnect;
 
+--disable_query_log
+use mysql;
+eval $innodb_table_stats;
+eval $innodb_index_stats;
+eval use $database;
+--enable_query_log
diff --git a/mysql-test/suite/innodb/r/innodb_bug57904.result b/mysql-test/suite/innodb/r/innodb_bug57904.result
index bbcd71325d1..909f77b25d4 100644
--- a/mysql-test/suite/innodb/r/innodb_bug57904.result
+++ b/mysql-test/suite/innodb/r/innodb_bug57904.result
@@ -13,18 +13,8 @@ INDEX (customer_id),
 FOREIGN KEY (customer_id)
 REFERENCES customer(id)
 ) ENGINE=INNODB;
-SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
-CONSTRAINT_CATALOG	def
-CONSTRAINT_SCHEMA	mysql
-CONSTRAINT_NAME	innodb_index_stats_ibfk_1
-UNIQUE_CONSTRAINT_CATALOG	def
-UNIQUE_CONSTRAINT_SCHEMA	mysql
-UNIQUE_CONSTRAINT_NAME	PRIMARY
-MATCH_OPTION	NONE
-UPDATE_RULE	RESTRICT
-DELETE_RULE	RESTRICT
-TABLE_NAME	innodb_index_stats
-REFERENCED_TABLE_NAME	innodb_table_stats
+SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
+WHERE table_name = 'product_order';
 CONSTRAINT_CATALOG	def
 CONSTRAINT_SCHEMA	test
 CONSTRAINT_NAME	product_order_ibfk_1
diff --git a/mysql-test/suite/innodb/t/innodb_bug57904.test b/mysql-test/suite/innodb/t/innodb_bug57904.test
index 48dc5254b26..97e7ec93d87 100755
--- a/mysql-test/suite/innodb/t/innodb_bug57904.test
+++ b/mysql-test/suite/innodb/t/innodb_bug57904.test
@@ -18,7 +18,8 @@ CREATE TABLE product_order (no INT NOT NULL AUTO_INCREMENT,
 		REFERENCES customer(id)
 	) ENGINE=INNODB;
 
-query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS;
+query_vertical SELECT * FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS
+WHERE table_name = 'product_order';
 
 DROP TABLE product_order;
 DROP TABLE product;
diff --git a/mysql-test/suite/perfschema/r/digest_table_full.result b/mysql-test/suite/perfschema/r/digest_table_full.result
index 218592c7644..f7d9d7116c0 100644
--- a/mysql-test/suite/perfschema/r/digest_table_full.result
+++ b/mysql-test/suite/perfschema/r/digest_table_full.result
@@ -76,7 +76,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
 NULL	NULL	29	21	1	2
-d238cb191361f39845a6adb2961f5501	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
+05a0fd27e76f6e38420b5dcae970c1d1	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
 SHOW VARIABLES LIKE "performance_schema_digests_size";
 Variable_name	Value
 performance_schema_digests_size	2
diff --git a/mysql-test/suite/perfschema/r/statement_digest.result b/mysql-test/suite/perfschema/r/statement_digest.result
index dc6ab2ee663..c6ffea69148 100644
--- a/mysql-test/suite/perfschema/r/statement_digest.result
+++ b/mysql-test/suite/perfschema/r/statement_digest.result
@@ -75,28 +75,28 @@ Warning	1265	Data truncated for column 'c' at row 1
 SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
 SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
 DIGEST	DIGEST_TEXT	COUNT_STAR	SUM_ROWS_AFFECTED	SUM_WARNINGS	SUM_ERRORS
-d238cb191361f39845a6adb2961f5501	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
-85d75a1b361e6afe5460639bddfc88ed	SELECT ? FROM t1  	1	0	0	0
-83d5ef3dc373ad216098b07c72e61063	SELECT ? FROM `t1`  	1	0	0	0
-ea6492426a33544a059bc12766c5ba3d	SELECT ?, ... FROM t1  	2	0	0	0
-c050a704c0817ec2865ead136ceea6ec	SELECT ? FROM t2  	1	0	0	0
-a98062477bd693dacfc0df96c68c5585	SELECT ?, ... FROM t2  	2	0	0	0
-72470fa90a09ac60fb0ab822a3d6ade0	INSERT INTO t1 VALUES (?)  	1	1	0	0
-3f5fd5225f11e3e8d5e8bda8ee6c1546	INSERT INTO t2 VALUES (?)  	1	1	0	0
-2057d54e44b8760b5414781df21e53e5	INSERT INTO t3 VALUES (...)  	1	1	0	0
-b6becf79cc1c5b9faf07bcd4680e87d1	INSERT INTO t4 VALUES (...)  	1	1	0	0
-7d68bb708120922be9668e8c29b2ba7e	INSERT INTO t5 VALUES (...)  	1	1	0	0
-16760e44bae66c003e39919411b8adbb	INSERT INTO t1 VALUES (?) /* , ... */  	2	7	0	0
-29df714911c3f9b83460385a21b5386d	INSERT INTO t3 VALUES (...) /* , ... */  	1	3	0	0
-5504ad628fc868be29157ccf556c6175	INSERT INTO t5 VALUES (...) /* , ... */  	1	3	0	0
-0babf2f70315be35a2a9ad6d3d800960	SELECT ? + ?  	3	0	0	0
-060c9d59b5b13bc4ec6188ec4f2822b1	SELECT ?  	1	0	0	0
+05a0fd27e76f6e38420b5dcae970c1d1	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1	0	0	0
+cc0d093a57fbe1694ee003da61a18f50	SELECT ? FROM t1  	1	0	0	0
+0bf450b7940cf3dd7fc720fdd6281d77	SELECT ? FROM `t1`  	1	0	0	0
+3ea6d9e2c71e6fe84643d647f257ef22	SELECT ?, ... FROM t1  	2	0	0	0
+e9d6214db9270d8e3b12694483a7ece0	SELECT ? FROM t2  	1	0	0	0
+8bfd768d8ce6c88ca3ace9e9eaf74fad	SELECT ?, ... FROM t2  	2	0	0	0
+49358f164df227c622fa9438e17c5a45	INSERT INTO t1 VALUES (?)  	1	1	0	0
+b5777ff47c7e7d37c738c3bbc99a5f50	INSERT INTO t2 VALUES (?)  	1	1	0	0
+b8f5b0056d36e62b060d605227e26bfb	INSERT INTO t3 VALUES (...)  	1	1	0	0
+835ec262d10fbedce1e31c397bdae877	INSERT INTO t4 VALUES (...)  	1	1	0	0
+c0cfc65392e6ea3d51708967b0795f09	INSERT INTO t5 VALUES (...)  	1	1	0	0
+3e743e4d942c7b76fccddbf15211367e	INSERT INTO t1 VALUES (?) /* , ... */  	2	7	0	0
+6048c5411fb3037b4db7a24eed82b83c	INSERT INTO t3 VALUES (...) /* , ... */  	1	3	0	0
+2312fd042d1232cd30e4172c69b0b2e4	INSERT INTO t5 VALUES (...) /* , ... */  	1	3	0	0
+33ebf25ca2afeea44fd5390801df4a0a	SELECT ? + ?  	3	0	0	0
+eb4368e66ef2ee0713b22abe1b94b5e7	SELECT ?  	1	0	0	0
 bce3f7384ae2ab78354b031184fde12d	CREATE SCHEMA statements_digest_temp  	2	2	0	0
 2a0e36afeaac85dc117c3856388a4fae	DROP SCHEMA statements_digest_temp  	2	0	0	0
-8761fd6b83357bdd00acd0b301cd1d43	SELECT ? FROM t11  	1	0	0	1
-2707097430c8f6e7b8c60d15d1f3ff9a	CREATE TABLE t11 ( c CHARACTER (?) )  	2	0	0	1
-503e81940feaf05afaafc435903f6bc3	INSERT INTO t11 VALUES (?)  	1	1	1	0
-cb0f8f969018eb9b6019e9fe069f6e2a	SHOW WARNINGS  	1	0	0	0
+5a6f99b35d55cdcb4c9bd755ff6bed58	SELECT ? FROM t11  	1	0	0	1
+88305d7ed153aeef764d4fb992f28034	CREATE TABLE t11 ( c CHARACTER (?) )  	2	0	0	1
+2a533c9f7e3b5d9dac18c4f8a0a49e53	INSERT INTO t11 VALUES (?)  	1	1	1	0
+35c70a6aa7abc3da331ef84b3663534b	SHOW WARNINGS  	1	0	0	0
 ####################################
 # CLEANUP
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_consumers.result b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
index 6daabcbd8bf..70e5c98435a 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_consumers.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_consumers.result
@@ -88,28 +88,28 @@ Warning	1265	Data truncated for column 'c' at row 1
 ####################################
 SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
 digest	digest_text	count_star
-d238cb191361f39845a6adb2961f5501	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
-85d75a1b361e6afe5460639bddfc88ed	SELECT ? FROM t1  	1
-83d5ef3dc373ad216098b07c72e61063	SELECT ? FROM `t1`  	1
-ea6492426a33544a059bc12766c5ba3d	SELECT ?, ... FROM t1  	2
-c050a704c0817ec2865ead136ceea6ec	SELECT ? FROM t2  	1
-a98062477bd693dacfc0df96c68c5585	SELECT ?, ... FROM t2  	2
-72470fa90a09ac60fb0ab822a3d6ade0	INSERT INTO t1 VALUES (?)  	1
-3f5fd5225f11e3e8d5e8bda8ee6c1546	INSERT INTO t2 VALUES (?)  	1
-2057d54e44b8760b5414781df21e53e5	INSERT INTO t3 VALUES (...)  	1
-b6becf79cc1c5b9faf07bcd4680e87d1	INSERT INTO t4 VALUES (...)  	1
-7d68bb708120922be9668e8c29b2ba7e	INSERT INTO t5 VALUES (...)  	1
-16760e44bae66c003e39919411b8adbb	INSERT INTO t1 VALUES (?) /* , ... */  	2
-29df714911c3f9b83460385a21b5386d	INSERT INTO t3 VALUES (...) /* , ... */  	1
-5504ad628fc868be29157ccf556c6175	INSERT INTO t5 VALUES (...) /* , ... */  	1
-0babf2f70315be35a2a9ad6d3d800960	SELECT ? + ?  	3
-060c9d59b5b13bc4ec6188ec4f2822b1	SELECT ?  	1
+05a0fd27e76f6e38420b5dcae970c1d1	TRUNCATE TABLE performance_schema . events_statements_summary_by_digest  	1
+cc0d093a57fbe1694ee003da61a18f50	SELECT ? FROM t1  	1
+0bf450b7940cf3dd7fc720fdd6281d77	SELECT ? FROM `t1`  	1
+3ea6d9e2c71e6fe84643d647f257ef22	SELECT ?, ... FROM t1  	2
+e9d6214db9270d8e3b12694483a7ece0	SELECT ? FROM t2  	1
+8bfd768d8ce6c88ca3ace9e9eaf74fad	SELECT ?, ... FROM t2  	2
+49358f164df227c622fa9438e17c5a45	INSERT INTO t1 VALUES (?)  	1
+b5777ff47c7e7d37c738c3bbc99a5f50	INSERT INTO t2 VALUES (?)  	1
+b8f5b0056d36e62b060d605227e26bfb	INSERT INTO t3 VALUES (...)  	1
+835ec262d10fbedce1e31c397bdae877	INSERT INTO t4 VALUES (...)  	1
+c0cfc65392e6ea3d51708967b0795f09	INSERT INTO t5 VALUES (...)  	1
+3e743e4d942c7b76fccddbf15211367e	INSERT INTO t1 VALUES (?) /* , ... */  	2
+6048c5411fb3037b4db7a24eed82b83c	INSERT INTO t3 VALUES (...) /* , ... */  	1
+2312fd042d1232cd30e4172c69b0b2e4	INSERT INTO t5 VALUES (...) /* , ... */  	1
+33ebf25ca2afeea44fd5390801df4a0a	SELECT ? + ?  	3
+eb4368e66ef2ee0713b22abe1b94b5e7	SELECT ?  	1
 bce3f7384ae2ab78354b031184fde12d	CREATE SCHEMA statements_digest_temp  	2
 2a0e36afeaac85dc117c3856388a4fae	DROP SCHEMA statements_digest_temp  	2
-8761fd6b83357bdd00acd0b301cd1d43	SELECT ? FROM t11  	1
-2707097430c8f6e7b8c60d15d1f3ff9a	CREATE TABLE t11 ( c CHARACTER (?) )  	2
-503e81940feaf05afaafc435903f6bc3	INSERT INTO t11 VALUES (?)  	1
-cb0f8f969018eb9b6019e9fe069f6e2a	SHOW WARNINGS  	1
+5a6f99b35d55cdcb4c9bd755ff6bed58	SELECT ? FROM t11  	1
+88305d7ed153aeef764d4fb992f28034	CREATE TABLE t11 ( c CHARACTER (?) )  	2
+2a533c9f7e3b5d9dac18c4f8a0a49e53	INSERT INTO t11 VALUES (?)  	1
+35c70a6aa7abc3da331ef84b3663534b	SHOW WARNINGS  	1
 SELECT digest, digest_text FROM performance_schema.events_statements_current;
 digest	digest_text
 ####################################
diff --git a/mysql-test/suite/perfschema/r/statement_digest_long_query.result b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
index c6a60a46cd4..225977a62af 100644
--- a/mysql-test/suite/perfschema/r/statement_digest_long_query.result
+++ b/mysql-test/suite/perfschema/r/statement_digest_long_query.result
@@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
 ####################################
 SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
 digest	digest_text	count_star
-d01d4cae378e1362fa70663f43b189d1	TRUNCATE TABLE events_statements_summary_by_digest  	1
-99d318822f9c746b71583a9d71b49fff	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
+e56a507698736d9cf34a6b043f9e5ed8	TRUNCATE TABLE events_statements_summary_by_digest  	1
+9eef21cb9bfa3ff9732c95e0ef47dbf1	SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ...	1
diff --git a/mysql-test/suite/sys_vars/t/ssl_ca_basic.test b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
index c369f1f0894..e7a7d6f6a4b 100644
--- a/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_ca_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
 
 --echo '#---------------------BS_STVARS_045_01----------------------#'
 ####################################################################
diff --git a/mysql-test/suite/sys_vars/t/ssl_cert_basic.test b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
index c3b69bd495f..56d24c11742 100644
--- a/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_cert_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
 
 --echo '#---------------------BS_STVARS_047_01----------------------#'
 ####################################################################
diff --git a/mysql-test/suite/sys_vars/t/ssl_key_basic.test b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
index 4616f281c27..8d755b4650b 100644
--- a/mysql-test/suite/sys_vars/t/ssl_key_basic.test
+++ b/mysql-test/suite/sys_vars/t/ssl_key_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################
 
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
 
 --echo '#---------------------BS_STVARS_049_01----------------------#'
 ####################################################################
diff --git a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
index 78a8e8944fd..559f9ae6eaa 100644
--- a/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
+++ b/mysql-test/suite/vcol/inc/vcol_supported_sql_funcs_main.inc
@@ -1179,7 +1179,7 @@ let $rows = 1;
 --source suite/vcol/inc/vcol_supported_sql_funcs.inc
 
 #--echo # DES_ENCRYPT(), DES_DECRYPT()
-#--source include/have_ssl.inc
+#--source include/have_ssl_communication.inc
 #let $cols = a varchar(1024), b varchar(1024) as (des_encrypt(des_decrypt(a,'adf'),'adf'));
 #let $values1 = 'MySQL',default;
 #let $rows = 1;
diff --git a/mysql-test/t/bug58669.test b/mysql-test/t/bug58669.test
index 332c104cfea..77827cde5ba 100644
--- a/mysql-test/t/bug58669.test
+++ b/mysql-test/t/bug58669.test
@@ -12,7 +12,7 @@ CREATE TABLE db1.t1(a INT);
 connect (con1,localhost,user1,,);
 connection con1;
 SELECT CURRENT_USER();
-SHOW VARIABLES LIKE "%read_only%";
+SHOW VARIABLES LIKE "read_only%";
 --error ER_OPTION_PREVENTS_STATEMENT
 INSERT INTO db1.t1 VALUES (1);
 
diff --git a/mysql-test/t/ssl_8k_key-master.opt b/mysql-test/t/ssl_8k_key-master.opt
index b58ca7f39f0..8d103df3a95 100644
--- a/mysql-test/t/ssl_8k_key-master.opt
+++ b/mysql-test/t/ssl_8k_key-master.opt
@@ -1 +1 @@
---loose-ssl-key=$MYSQL_TEST_DIR/std_data/server8k-key.pem --loose-ssl-cert=$MYSQL_TEST_DIR/std_data/server8k-cert.pem
+--ssl-key=$MYSQL_TEST_DIR/std_data/server8k-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/server8k-cert.pem
diff --git a/mysql-test/t/ssl_cipher.test b/mysql-test/t/ssl_cipher.test
index 5346968175c..cf249343324 100644
--- a/mysql-test/t/ssl_cipher.test
+++ b/mysql-test/t/ssl_cipher.test
@@ -5,7 +5,7 @@
 --echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
 --echo #
 
--- source include/have_ssl.inc
+-- source include/have_ssl_communication.inc
 
 # Save the initial number of concurrent sessions
 --source include/count_sessions.inc
diff --git a/mysql-test/t/ssl_crl.test b/mysql-test/t/ssl_crl.test
index b12317b0381..65c14837e50 100644
--- a/mysql-test/t/ssl_crl.test
+++ b/mysql-test/t/ssl_crl.test
@@ -1,14 +1,7 @@
 # This test should work in embedded server after we fix mysqltest
 -- source include/not_embedded.inc
--- source include/have_ssl_communication.inc
 -- source include/have_openssl.inc
 
-let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
-if (!$crllen)
-{
-  skip Needs OpenSSL;
-}
-
 --echo # test --crl for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
diff --git a/mysql-test/t/ssl_crl_clients.test b/mysql-test/t/ssl_crl_clients.test
index 56f43b2425e..7c05f498fbe 100644
--- a/mysql-test/t/ssl_crl_clients.test
+++ b/mysql-test/t/ssl_crl_clients.test
@@ -1,14 +1,7 @@
 # This test should work in embedded server after we fix mysqltest
 -- source include/not_embedded.inc
--- source include/have_ssl_communication.inc
 -- source include/have_openssl.inc
 
-let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
-if (!$crllen)
-{
-  skip Needs OpenSSL;
-}
-
 --echo # Test clients with and without CRL lists
 
 let $ssl_base = --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-server-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-server-cert.pem;
@@ -36,13 +29,13 @@ let $admin_suffix = --default-character-set=latin1 -S $MASTER_MYSOCK -P $MASTER_
 --echo # Test mysqladmin connecting to a server with a certificate revoked by -crl
 --disable_result_log
 --replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/
---error 1
+--error 2
 --exec $MYSQLADMIN $admin_prefix $ssl_crl $admin_suffix 2>&1
 --enable_result_log
 
 --disable_result_log
 --echo # Test mysqladmin connecting to a server with a certificate revoked by -crlpath
 --replace_regex /.*mysqladmin.*: connect/mysqladmin: connect/
---error 1
+--error 2
 --exec $MYSQLADMIN $admin_prefix $ssl_crlpath $admin_suffix 2>&1
 --enable_result_log
diff --git a/mysql-test/t/ssl_crl_clients_valid.test b/mysql-test/t/ssl_crl_clients_valid.test
index ff120693d85..f08fbf09397 100644
--- a/mysql-test/t/ssl_crl_clients_valid.test
+++ b/mysql-test/t/ssl_crl_clients_valid.test
@@ -1,14 +1,7 @@
 # This test should work in embedded server after we fix mysqltest
 -- source include/not_embedded.inc
--- source include/have_ssl_communication.inc
 -- source include/have_openssl.inc
 
-let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
-if (!$crllen)
-{
-  skip Needs OpenSSL;
-}
-
 --echo # Test clients with and without CRL lists
 
 let $ssl_base = --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-server-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-server-cert.pem;
diff --git a/mysql-test/t/ssl_crl_clrpath.test b/mysql-test/t/ssl_crl_clrpath.test
index 2f1af145574..50d84ad175e 100644
--- a/mysql-test/t/ssl_crl_clrpath.test
+++ b/mysql-test/t/ssl_crl_clrpath.test
@@ -1,14 +1,7 @@
 # This test should work in embedded server after we fix mysqltest
 -- source include/not_embedded.inc
--- source include/have_ssl_communication.inc
 -- source include/have_openssl.inc
 
-let $crllen=`select length(trim(coalesce(@@ssl_crl, ''))) + length(trim(coalesce(@@ssl_crlpath, '')))`;
-if (!$crllen)
-{
-  skip Needs OpenSSL;
-}
-
 --echo # test --crl for the client : should connect
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL --ssl-ca=$MYSQL_TEST_DIR/std_data/crl-ca-cert.pem --ssl-key=$MYSQL_TEST_DIR/std_data/crl-client-valid-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/crl-client-valid-cert.pem test --ssl-crl=$MYSQL_TEST_DIR/std_data/crl-client-revoked.crl -e "SHOW VARIABLES like '%ssl%';"
author	Sergei Golubchik <sergii@pisem.net>	2012-10-01 13:15:29 +0200
committer	Sergei Golubchik <sergii@pisem.net>	2012-10-01 13:15:29 +0200
commit	416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch)
tree	5244b83a9f22d4d5899154c9a64a316111bbe6b6 /mysql-test
parent	adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff)
download	mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz