diff options
author | unknown <kostja@vajra.(none)> | 2007-04-06 14:15:29 +0400 |
---|---|---|
committer | unknown <kostja@vajra.(none)> | 2007-04-06 14:15:29 +0400 |
commit | 306be7fee9e41b02e54941099e25fba630a13580 (patch) | |
tree | a4d354e6d023ab4422339659f6157ff560e88d41 /mysql-test/r/openssl_1.result | |
parent | 93e7a470826e62f2a851d2db435e9f9361b2fb01 (diff) | |
parent | dd0c20ac289b6257c59c4867bb15aafec0db3f22 (diff) | |
download | mariadb-git-306be7fee9e41b02e54941099e25fba630a13580.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into vajra.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/openssl_1.result:
Manual resolve.
mysql-test/t/openssl_1.test:
Manual resolve.
Diffstat (limited to 'mysql-test/r/openssl_1.result')
-rw-r--r-- | mysql-test/r/openssl_1.result | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/openssl_1.result b/mysql-test/r/openssl_1.result index 92900ac1a83..c6e077b2857 100644 --- a/mysql-test/r/openssl_1.result +++ b/mysql-test/r/openssl_1.result @@ -53,3 +53,25 @@ SSL error: Unable to get certificate from '' mysqltest: Could not open connection 'default': 2026 SSL connection error Variable_name Value Ssl_cipher DHE-RSA-AES256-SHA +End of 5.0 tests +DROP TABLE IF EXISTS thread_status; +DROP EVENT IF EXISTS event_status; +SET GLOBAL event_scheduler=1; +CREATE EVENT event_status +ON SCHEDULE AT NOW() +ON COMPLETION NOT PRESERVE +DO +BEGIN +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'; +END$$ +SELECT variable_name, variable_value FROM thread_status; +variable_name variable_value +SSL_ACCEPTS 0.0000000 +SSL_CALLBACK_CACHE_HITS 0.0000000 +DROP TABLE thread_status; +SET GLOBAL event_scheduler=0; +End of 5.1 tests |