Commit 9bf9e226 authored by unknown's avatar unknown
Browse files

After merge fixes 


BitKeeper/deleted/.del-rpl_ssl_verify_server.test:
  Delete: mysql-test/t/rpl_ssl_verify_server.test
BitKeeper/deleted/.del-rpl_ssl_verify_server.result:
  Delete: mysql-test/r/rpl_ssl_verify_server.result
mysql-test/r/rpl_known_bugs_detection.result:
  Add new column after merge
mysql-test/r/rpl_ssl.result:
  Add new column after merge
mysql-test/r/rpl_ssl1.result:
  Merge test and result file
mysql-test/t/rpl_ssl1.test:
  Merge test and result file
parent d86d393f

mysql-test/r/rpl_known_bugs_detection.result

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SELECT * FROM t1;

a	b

stop slave;
@@ -127,6 +128,7 @@ Master_SSL_Cert 
Master_SSL_Cipher	

Master_SSL_Key	

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

SELECT * FROM t1;

id	field_1	field_2	field_3

drop table t1, t2;

mysql-test/r/rpl_ssl.result

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 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	#

Master_SSL_Verify_Server_Cert	No

STOP SLAVE;

select * from t1;

t
@@ -91,3 +92,4 @@ 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	#

Master_SSL_Verify_Server_Cert	No

mysql-test/r/rpl_ssl1.result

+51 −0
Original line number Diff line number Diff line
@@ -93,3 +93,54 @@ Master_SSL_Cipher 
Master_SSL_Key	MYSQL_TEST_DIR/std_data/client-key.pem

Seconds_Behind_Master	#

Master_SSL_Verify_Server_Cert	No

stop slave;

change master to

master_host="localhost",

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',

master_ssl_verify_server_cert=1;

start slave;

create table t1 (t int);

insert into t1 values (1);

on slave

select * from t1;

t

1

show slave status;

Slave_IO_State	#

Master_Host	localhost

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	#

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	#

Slave_IO_Running	#

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	#

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	#

Master_SSL_Verify_Server_Cert	Yes

drop table t1;

mysql-test/r/rpl_ssl_verify_server.result

deleted100644 → 0
+0 −57
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;

stop slave;

change master to

master_host="localhost",

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',

master_ssl_verify_server_cert=1;

start slave;

create table t1 (t int);

insert into t1 values (1);

on slave

select * from t1;

t

1

show slave status;

Slave_IO_State	#

Master_Host	localhost

Master_User	root

Master_Port	MASTER_MYPORT

Connect_Retry	1

Master_Log_File	#

Read_Master_Log_Pos	#

Relay_Log_File	#

Relay_Log_Pos	#

Relay_Master_Log_File	#

Slave_IO_Running	#

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	#

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	#

Master_SSL_Verify_Server_Cert	Yes

drop table t1;

mysql-test/t/rpl_ssl1.test

+32 −0
Original line number Diff line number Diff line
@@ -63,3 +63,35 @@ sync_with_master; 
query_vertical show slave status;



# End of 4.1 tests



# Start replication with ssl_verify_server_cert turned on

connection slave;

stop slave;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval change master to

 master_host="localhost",

 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',

 master_ssl_verify_server_cert=1;

start slave;



connection master;

create table t1 (t int);

insert into t1 values (1);



sync_slave_with_master;



echo on slave;

#checking that replication is ok

select * from t1;



#checking show slave status

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 #

query_vertical show slave status;



connection master;

drop table t1;

sync_slave_with_master;