From 1fdc7e67601dcc673b356b7a61a3a6aeca618494 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 10 Aug 2005 13:30:53 -0700 Subject: Fix rpl_openssl test to actually work. (Bug #12457, Bug #10860) mysql-test/r/rpl_openssl.result: Update results mysql-test/t/rpl_openssl.test: Test whether server has SSL support, not whether the client is using SSL. Use 'localhost' in user we create to avoid problems with anonymous user. --- mysql-test/t/rpl_openssl.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mysql-test/t/rpl_openssl.test') diff --git a/mysql-test/t/rpl_openssl.test b/mysql-test/t/rpl_openssl.test index 78731e4dc7d..e15eb9b179a 100644 --- a/mysql-test/t/rpl_openssl.test +++ b/mysql-test/t/rpl_openssl.test @@ -1,4 +1,4 @@ -source include/have_openssl_1.inc; +source include/have_openssl.inc; source include/master-slave.inc; # We don't test all types of ssl auth params here since it's a bit hard @@ -7,7 +7,7 @@ source include/master-slave.inc; # creating replication user for whom ssl auth is required # preparing playground connection master; -grant replication slave on *.* to replssl@'%' require ssl; +grant replication slave on *.* to replssl@localhost require ssl; create table t1 (t int); save_master_pos; -- cgit v1.2.1 From 2f15f8b4560c7837758a37e10b4c7381f8a21ecf Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 11 Aug 2005 17:14:11 -0700 Subject: Fix which include file is used to decide whether to skip rpl_openssl, the earlier change wasn't correct. (But the other changes to the test were.) mysql-test/t/rpl_openssl.test: Use correct include file --- mysql-test/t/rpl_openssl.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/t/rpl_openssl.test') diff --git a/mysql-test/t/rpl_openssl.test b/mysql-test/t/rpl_openssl.test index e15eb9b179a..3c151721d8e 100644 --- a/mysql-test/t/rpl_openssl.test +++ b/mysql-test/t/rpl_openssl.test @@ -1,4 +1,4 @@ -source include/have_openssl.inc; +source include/have_openssl_1.inc; source include/master-slave.inc; # We don't test all types of ssl auth params here since it's a bit hard -- cgit v1.2.1