From 9bf9e226ca45e02f8f83cebaedb395ed84141dc0 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.blaudden>
Date: Thu, 29 Mar 2007 16:11:02 +0200
Subject: [PATCH] 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
---
 mysql-test/r/rpl_known_bugs_detection.result |  2 +
 mysql-test/r/rpl_ssl.result                  |  2 +
 mysql-test/r/rpl_ssl1.result                 | 51 ++++++++++++++++++
 mysql-test/r/rpl_ssl_verify_server.result    | 57 --------------------
 mysql-test/t/rpl_ssl1.test                   | 32 +++++++++++
 mysql-test/t/rpl_ssl_verify_server.test      | 34 ------------
 6 files changed, 87 insertions(+), 91 deletions(-)
 delete mode 100644 mysql-test/r/rpl_ssl_verify_server.result
 delete mode 100644 mysql-test/t/rpl_ssl_verify_server.test

diff --git a/mysql-test/r/rpl_known_bugs_detection.result b/mysql-test/r/rpl_known_bugs_detection.result
index eabc6185780..a09d63a5848 100644
--- a/mysql-test/r/rpl_known_bugs_detection.result
+++ b/mysql-test/r/rpl_known_bugs_detection.result
@@ -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;
diff --git a/mysql-test/r/rpl_ssl.result b/mysql-test/r/rpl_ssl.result
index 33deb9a8c92..f68b639b12d 100644
--- a/mysql-test/r/rpl_ssl.result
+++ b/mysql-test/r/rpl_ssl.result
@@ -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
diff --git a/mysql-test/r/rpl_ssl1.result b/mysql-test/r/rpl_ssl1.result
index 2cb9a8a7c48..6bc4b53849f 100644
--- a/mysql-test/r/rpl_ssl1.result
+++ b/mysql-test/r/rpl_ssl1.result
@@ -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;
diff --git a/mysql-test/r/rpl_ssl_verify_server.result b/mysql-test/r/rpl_ssl_verify_server.result
deleted file mode 100644
index 18265ca2ec8..00000000000
--- a/mysql-test/r/rpl_ssl_verify_server.result
+++ /dev/null
@@ -1,57 +0,0 @@
-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;
diff --git a/mysql-test/t/rpl_ssl1.test b/mysql-test/t/rpl_ssl1.test
index cb7bee8e6d3..6ca1484bb17 100644
--- a/mysql-test/t/rpl_ssl1.test
+++ b/mysql-test/t/rpl_ssl1.test
@@ -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;
diff --git a/mysql-test/t/rpl_ssl_verify_server.test b/mysql-test/t/rpl_ssl_verify_server.test
deleted file mode 100644
index de83abdf566..00000000000
--- a/mysql-test/t/rpl_ssl_verify_server.test
+++ /dev/null
@@ -1,34 +0,0 @@
-source include/have_openssl.inc;
-source include/master-slave.inc;
-
-# 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;
-- 
2.30.9