32e03b2cdd
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: Ibc2ad09bef7a7f40e337513a1694a22f38d7f4e9
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
---
|
|
mysql-test/r/ssl_8k_key.result | 4 ++--
|
|
mysql-test/t/ssl_8k_key.test | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/r/ssl_8k_key.result
|
|
index b33a1d2..ff9d0cc 100644
|
|
--- a/mysql-test/r/ssl_8k_key.result
|
|
+++ b/mysql-test/r/ssl_8k_key.result
|
|
@@ -1,2 +1,2 @@
|
|
-Variable_name Value
|
|
-Ssl_cipher DHE-RSA-AES256-SHA
|
|
+have_ssl
|
|
+1
|
|
diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
|
|
index 27cffdc..4b81648 100644
|
|
--- a/mysql-test/t/ssl_8k_key.test
|
|
+++ b/mysql-test/t/ssl_8k_key.test
|
|
@@ -5,7 +5,7 @@
|
|
#
|
|
# Bug#29784 YaSSL assertion failure when reading 8k key.
|
|
#
|
|
---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
|
|
+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
|
|
|
|
## This test file is for testing encrypted communication only, not other
|
|
## encryption routines that the SSL library happens to provide!
|
|
--
|
|
1.9.1
|
|
|