Commit 3bc84a03 authored by unknown's avatar unknown
Browse files

Merge pilot.blaudden:/home/msvensson/mysql/bug21781/my50-bug21781 

into  pilot.blaudden:/home/msvensson/mysql/bug21781/my51-bug21781


mysql-test/t/rpl_openssl.test:
  Auto merged
sql/mysql_priv.h:
  Manual merge
sql/mysqld.cc:
  Manual merge
sql/set_var.cc:
  Manual merge
parents 708d0d72 9cace97d

mysql-test/include/have_openssl.inc→mysql-test/include/have_ssl.inc

+4 −0
Original line number Diff line number Diff line 
-- require r/have_openssl.require

-- require r/have_ssl.require

disable_query_log;

show variables like "have_openssl";

show variables like "have_ssl";

enable_query_log;

mysql-test/r/have_openssl.require→mysql-test/r/have_ssl.require

+1 −1
Original line number Diff line number Diff line 
Variable_name	Value

have_openssl	YES
 
have_ssl	YES

mysql-test/r/rpl_ssl.result

0 → 100644
+93 −0
Original line number Diff line number Diff line 
stop slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

reset master;

reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

grant replication slave on *.* to replssl@localhost require ssl;

create table t1 (t int auto_increment, KEY(t));

stop slave;

change master to

master_user='replssl',

master_password='',

master_ssl=1,

master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem',

master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem',

master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem';

start slave;

insert into t1 values(1);

select * from t1;

t

1

show slave status;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	replssl

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	420

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	420

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	Yes

Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem

Master_SSL_CA_Path	

Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem

Master_SSL_Cipher	

Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem

Seconds_Behind_Master	#

STOP SLAVE;

select * from t1;

t

1

show slave status;

Slave_IO_State	#

Master_Host	127.0.0.1

Master_User	replssl

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	master-bin.000001

Read_Master_Log_Pos	12320

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	master-bin.000001

Slave_IO_Running	Yes

Slave_SQL_Running	Yes

Replicate_Do_DB	

Replicate_Ignore_DB	

Replicate_Do_Table	

Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	0

Last_Error	

Skip_Counter	0

Exec_Master_Log_Pos	12320

Relay_Log_Space	#

Until_Condition	None

Until_Log_File	

Until_Log_Pos	0

Master_SSL_Allowed	Yes

Master_SSL_CA_File	MYSQL_TEST_DIR/std_data/cacert.pem

Master_SSL_CA_Path	

Master_SSL_Cert	MYSQL_TEST_DIR/std_data/client-cert.pem

Master_SSL_Cipher	

Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem

Seconds_Behind_Master	#

mysql-test/t/func_des_encrypt.test

+1 −1
Original line number Diff line number Diff line 
-- source include/have_openssl.inc

-- source include/have_ssl.inc



# This test can't be in func_encrypt.test, because it requires

# --des-key-file to not be set.

mysql-test/t/func_encrypt.test

+1 −1
Original line number Diff line number Diff line 
-- source include/have_openssl.inc

-- source include/have_ssl.inc



--disable_warnings

drop table if exists t1;