List:Commits« Previous MessageNext Message »
From:Mayank Prasad Date:March 11 2011 11:33am
Subject:bzr commit into mysql-trunk branch (mayank.prasad:3750) Bug#11760210
View as plain text  
#At file:///home/mayank/mysql-server/mysql-trunk/ based on revid:marc.alff@stripped

 3750 Mayank Prasad	2011-03-11 [merge]
      merge from mysql-5.5 for bug#11760210

    added:
      mysql-test/r/ssl_cipher.result
      mysql-test/t/ssl_cipher-master.opt
      mysql-test/t/ssl_cipher.test
    modified:
      extra/yassl/src/yassl_int.cpp
      mysql-test/suite/perfschema/r/relaylog.result
      mysql-test/suite/perfschema/t/relaylog.test
=== modified file 'extra/yassl/src/yassl_int.cpp'
--- a/extra/yassl/src/yassl_int.cpp	2009-09-23 13:21:29 +0000
+++ b/extra/yassl/src/yassl_int.cpp	2011-03-11 10:46:34 +0000
@@ -308,7 +308,7 @@ SSL::SSL(SSL_CTX* ctx) 
             SetError(YasslError(err));
             return;
         }
-        else if (serverSide) {
+        else if (serverSide && !(ctx->GetCiphers().setSuites_)) {
             // remove RSA or DSA suites depending on cert key type
             ProtocolVersion pv = secure_.get_connection().version_;
             

=== added file 'mysql-test/r/ssl_cipher.result'
--- a/mysql-test/r/ssl_cipher.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/ssl_cipher.result	2011-03-11 10:46:34 +0000
@@ -0,0 +1,9 @@
+#
+# BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+#
+SHOW STATUS LIKE 'Ssl_cipher';
+Variable_name	Value
+Ssl_cipher	AES128-SHA
+SHOW STATUS LIKE 'Ssl_cipher_list';
+Variable_name	Value
+Ssl_cipher_list	AES128-SHA

=== modified file 'mysql-test/suite/perfschema/r/relaylog.result'
--- a/mysql-test/suite/perfschema/r/relaylog.result	2011-03-10 12:30:05 +0000
+++ b/mysql-test/suite/perfschema/r/relaylog.result	2011-03-11 11:33:38 +0000
@@ -84,7 +84,11 @@ if (count_write > 0,"MANY", "NONE") as C
 if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ,
 if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE
 from performance_schema.file_summary_by_instance
-where file_name like "%slave-%" order by file_name;
+where file_name like "%slave-%"
+  and (file_name not like "%slave-relay-bin.0%"
+       or file_name like "%slave-relay-bin.000001"
+       or file_name like "%slave-relay-bin.000002")
+order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-bin.000001	wait/io/file/sql/binlog	MANY	MANY	MANY	MANY
 slave-bin.index	wait/io/file/sql/binlog_index	NONE	NONE	NONE	NONE
@@ -135,7 +139,11 @@ if (count_write > 0,"MANY", "NONE") as C
 if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ,
 if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE
 from performance_schema.file_summary_by_instance
-where event_name like "%relaylog%" order by file_name;
+where event_name like "%relaylog%"
+  and (file_name not like "%slave-relay-bin.0%"
+       or file_name like "%slave-relay-bin.000001"
+       or file_name like "%slave-relay-bin.000002")
+order by file_name;
 FILE_NAME	EVENT_NAME	COUNT_READ	COUNT_WRITE	SUM_NUMBER_OF_BYTES_READ	SUM_NUMBER_OF_BYTES_WRITE
 slave-relay-bin.000001	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY
 slave-relay-bin.000002	wait/io/file/sql/relaylog	MANY	MANY	MANY	MANY

=== modified file 'mysql-test/suite/perfschema/t/relaylog.test'
--- a/mysql-test/suite/perfschema/t/relaylog.test	2011-03-10 12:02:28 +0000
+++ b/mysql-test/suite/perfschema/t/relaylog.test	2011-03-11 10:45:16 +0000
@@ -31,6 +31,18 @@ drop table test.t1;
 
 --source include/show_binlog_events.inc
 
+# Notes
+#
+# The point of this test is to make sure code is properly instrumented,
+# where instruments have the proper key (binlog or relaylog),
+# it is not to dive into statistics for each instruments.
+# Different test execution sequence in different platforms do make the
+# results vary, making the test results very sensitive to changes.
+# To ensure robustness:
+# - log file rotation is limited to file .000001 and .000002
+# - statistics are normalized to "NONE" or "MANY"
+#
+
 connection master;
 -- echo "============ Performance schema on master ============"
 
@@ -99,7 +111,11 @@ select
   if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ,
   if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE
   from performance_schema.file_summary_by_instance
-  where file_name like "%slave-%" order by file_name;
+  where file_name like "%slave-%"
+  and (file_name not like "%slave-relay-bin.0%"
+       or file_name like "%slave-relay-bin.000001"
+       or file_name like "%slave-relay-bin.000002")
+  order by file_name;
 
 -- echo "Expect a slave binlog + binlog_index"
 
@@ -138,7 +154,11 @@ select
   if (sum_number_of_bytes_read > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_READ,
   if (sum_number_of_bytes_write > 0, "MANY", "NONE") as SUM_NUMBER_OF_BYTES_WRITE
   from performance_schema.file_summary_by_instance
-  where event_name like "%relaylog%" order by file_name;
+  where event_name like "%relaylog%"
+  and (file_name not like "%slave-relay-bin.0%"
+       or file_name like "%slave-relay-bin.000001"
+       or file_name like "%slave-relay-bin.000002")
+  order by file_name;
 
 select
   EVENT_NAME,

=== added file 'mysql-test/t/ssl_cipher-master.opt'
--- a/mysql-test/t/ssl_cipher-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ssl_cipher-master.opt	2011-03-11 10:46:34 +0000
@@ -0,0 +1 @@
+--ssl-cipher=AES128-SHA

=== added file 'mysql-test/t/ssl_cipher.test'
--- a/mysql-test/t/ssl_cipher.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/ssl_cipher.test	2011-03-11 10:46:34 +0000
@@ -0,0 +1,23 @@
+# Turn on ssl between the client and server
+# and run a number of tests
+
+--echo #
+--echo # BUG#11760210 - SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LIKE 'SSL_CIPHER_LIST'"
+--echo #
+
+-- source include/have_ssl.inc
+
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+connect (ssl_con,localhost,root,,,,,SSL);
+
+# Check Cipher Name and Cipher List
+SHOW STATUS LIKE 'Ssl_cipher';
+SHOW STATUS LIKE 'Ssl_cipher_list';
+
+connection default;
+disconnect ssl_con;
+
+# Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into mysql-trunk branch (mayank.prasad:3750) Bug#11760210Mayank Prasad11 Mar