bk commit into 5.0 tree (msvensson:1.2447)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-11 21:01:10+02:00, msvensson@stripped +2 -0
  Add test for connect using different ssl  ciphers

  mysql-test/r/openssl_1.result@stripped, 2007-04-11 21:01:09+02:00, msvensson@stripped +7 -0
    Update result

  mysql-test/t/openssl_1.test@stripped, 2007-04-11 21:01:09+02:00, msvensson@stripped +21 -0
    Add test for connect using different ssl  ciphers

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.18/mysql-test/r/openssl_1.result	2007-03-28 12:23:53 +02:00
+++ 1.19/mysql-test/r/openssl_1.result	2007-04-11 21:01:09 +02:00
@@ -53,3 +53,10 @@ SSL error: Unable to get certificate fro
 mysqltest: Could not open connection 'default': 2026 SSL connection error
 Variable_name	Value
 Ssl_cipher	DHE-RSA-AES256-SHA
+SHOW STATUS LIKE 'Ssl_cipher';
+Variable_name	Value
+Ssl_cipher	AES128-SHA
+SHOW STATUS LIKE 'Ssl_cipher';
+Variable_name	Value
+Ssl_cipher	AES128-SHA
+mysqltest: Could not open connection 'default': 2026 SSL connection error

--- 1.19/mysql-test/t/openssl_1.test	2007-03-29 11:40:36 +02:00
+++ 1.20/mysql-test/t/openssl_1.test	2007-04-11 21:01:09 +02:00
@@ -104,3 +104,24 @@ drop table t1;
 # and ca path to NULL
 #
 --exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
+
+
+#
+# Test to connect using a list of ciphers
+#
+--exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql
+--exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER:AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
+
+
+# Test to connect using a specifi cipher
+#
+--exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql
+--exec $MYSQL_TEST --ssl-cipher=AES128-SHA < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
+
+# Test to connect using an unknown cipher
+#
+--exec echo "SHOW STATUS LIKE 'Ssl_cipher';" > $MYSQLTEST_VARDIR/tmp/test.sql
+--error 1
+--exec $MYSQL_TEST --ssl-cipher=UNKNOWN-CIPHER < $MYSQLTEST_VARDIR/tmp/test.sql 2>&1
+
+