bzr push into mysql-trunk branch (Georgi.Kodinov:3397 to 3398) Bug#11747191

[Georgi Kodinov]

 3398 Georgi Kodinov	2011-08-23
      Addendum fix for bug #11747191: 31224: SUPPORT FOR SSL CERTIFICATE REVOCATION LISTS
      
      Test case and result changes:
      - Added basic ssl_crl and ssl_crlpath tests to the sys_vars testsuite to keep the check happy.
      - Added the two columns to the embedded I_S test result

    added:
      mysql-test/suite/sys_vars/r/ssl_crl_basic.result
      mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result
      mysql-test/suite/sys_vars/t/ssl_crl_basic.test
      mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test
    modified:
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
 3397 Matthias Leich	2011-08-23
      socket_summary_by_instance failed sporadic in PB
      1. Avoid that some calculation hits the upper limit of the value range.
         This might fix the issues seen in PB.
      2. In case of unexpected results, this already means that the test failed,
         print the complete content of important tables. This might accelarate
         the bug analysis.
      
           

    modified:
      mysql-test/suite/perfschema/include/socket_check1.inc
      mysql-test/suite/perfschema/include/socket_summary_check.inc
      mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result
      mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
=== modified file 'mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result'
--- a/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-08-19 13:04:28 +0000
+++ b/mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result	2011-08-23 13:20:16 +0000
@@ -180,6 +180,8 @@ def	mysql	slave_master_info	Ssl_ca	11	NU
 def	mysql	slave_master_info	Ssl_capath	12	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The path to the Certificate Authority (CA) certificates.
 def	mysql	slave_master_info	Ssl_cert	13	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The name of the SSL certificate file.
 def	mysql	slave_master_info	Ssl_cipher	14	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The name of the cipher in use for the SSL connection.
+def	mysql	slave_master_info	Ssl_crl	22	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The file used for the Certificate Revocation List (CRL)
+def	mysql	slave_master_info	Ssl_crlpath	23	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The path used for Certificate Revocation List (CRL) files
 def	mysql	slave_master_info	Ssl_key	15	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The name of the SSL key file.
 def	mysql	slave_master_info	Ssl_verify_server_cert	16	NULL	NO	tinyint	NULL	NULL	3	0	NULL	NULL	tinyint(1)				Whether to verify the server certificate.
 def	mysql	slave_master_info	User_name	6	NULL	YES	text	65535	65535	NULL	NULL	utf8	utf8_bin	text				The user name used to connect to the master.
@@ -536,6 +538,8 @@ NULL	mysql	slave_master_info	Heartbeat	f
 1.0000	mysql	slave_master_info	Ignored_server_ids	text	65535	65535	utf8	utf8_bin	text
 1.0000	mysql	slave_master_info	Uuid	text	65535	65535	utf8	utf8_bin	text
 NULL	mysql	slave_master_info	Retry_count	bigint	NULL	NULL	NULL	NULL	bigint(20) unsigned
+1.0000	mysql	slave_master_info	Ssl_crl	text	65535	65535	utf8	utf8_bin	text
+1.0000	mysql	slave_master_info	Ssl_crlpath	text	65535	65535	utf8	utf8_bin	text
 NULL	mysql	slave_relay_log_info	Master_id	int	NULL	NULL	NULL	NULL	int(10) unsigned
 NULL	mysql	slave_relay_log_info	Number_of_lines	int	NULL	NULL	NULL	NULL	int(10) unsigned
 1.0000	mysql	slave_relay_log_info	Relay_log_name	text	65535	65535	utf8	utf8_bin	text

=== added file 'mysql-test/suite/sys_vars/r/ssl_crl_basic.result'
--- a/mysql-test/suite/sys_vars/r/ssl_crl_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/ssl_crl_basic.result	2011-08-23 13:20:16 +0000
@@ -0,0 +1,5 @@
+# a simplified test to keep the suite happy.
+# the real test is in main.
+select @@ssl_crl;
+@@ssl_crl
+NULL

=== added file 'mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result'
--- a/mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/r/ssl_crlpath_basic.result	2011-08-23 13:20:16 +0000
@@ -0,0 +1,5 @@
+# a simplified test to keep the suite happy.
+# the real test is in main.
+select @@ssl_crlpath;
+@@ssl_crlpath
+NULL

=== added file 'mysql-test/suite/sys_vars/t/ssl_crl_basic.test'
--- a/mysql-test/suite/sys_vars/t/ssl_crl_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/ssl_crl_basic.test	2011-08-23 13:20:16 +0000
@@ -0,0 +1,3 @@
+--echo # a simplified test to keep the suite happy.
+--echo # the real test is in main.
+select @@ssl_crl;

=== added file 'mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test'
--- a/mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/sys_vars/t/ssl_crlpath_basic.test	2011-08-23 13:20:16 +0000
@@ -0,0 +1,3 @@
+--echo # a simplified test to keep the suite happy.
+--echo # the real test is in main.
+select @@ssl_crlpath;

No bundle (reason: useless for push emails).