35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
AFAICT this test is simply guaranteed to fail if run with SSL connections
|
||
|
|
enabled. Remove the part that depends on the SSL connection history.
|
||
|
|
|
||
|
|
|
||
|
|
diff -Naur mysql-5.1.30.orig/mysql-test/r/openssl_1.result mysql-5.1.30/mysql-test/r/openssl_1.result
|
||
|
|
--- mysql-5.1.30.orig/mysql-test/r/openssl_1.result 2008-11-14 12:30:53.000000000 -0500
|
||
|
|
+++ mysql-5.1.30/mysql-test/r/openssl_1.result 2009-01-13 12:57:01.000000000 -0500
|
||
|
|
@@ -68,12 +68,10 @@
|
||
|
|
CREATE TABLE thread_status
|
||
|
|
SELECT variable_name, variable_value
|
||
|
|
FROM information_schema.session_status
|
||
|
|
-WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||
|
|
-variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||
|
|
+WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||
|
|
END$$
|
||
|
|
SELECT variable_name, variable_value FROM thread_status;
|
||
|
|
variable_name variable_value
|
||
|
|
-SSL_ACCEPTS 0
|
||
|
|
SSL_CALLBACK_CACHE_HITS 0
|
||
|
|
DROP TABLE thread_status;
|
||
|
|
SET GLOBAL event_scheduler=0;
|
||
|
|
diff -Naur mysql-5.1.30.orig/mysql-test/t/openssl_1.test mysql-5.1.30/mysql-test/t/openssl_1.test
|
||
|
|
--- mysql-5.1.30.orig/mysql-test/t/openssl_1.test 2008-11-14 12:30:15.000000000 -0500
|
||
|
|
+++ mysql-5.1.30/mysql-test/t/openssl_1.test 2009-01-13 12:56:42.000000000 -0500
|
||
|
|
@@ -136,8 +136,7 @@
|
||
|
|
CREATE TABLE thread_status
|
||
|
|
SELECT variable_name, variable_value
|
||
|
|
FROM information_schema.session_status
|
||
|
|
- WHERE variable_name LIKE 'SSL_ACCEPTS' OR
|
||
|
|
- variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||
|
|
+ WHERE variable_name LIKE 'SSL_CALLBACK_CACHE_HITS';
|
||
|
|
END$$
|
||
|
|
|
||
|
|
DELIMITER ;$$
|