From: Date: March 5 2007 10:07am
Subject: bk commit into 5.0 tree (msvensson:1.2458) BUG#21781
List-Archive: http://lists.mysql.com/commits/21111
X-Bug: 21781
Message-Id: <200703050907.l2597PVl005515@pilot.blaudden>

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-03-05 10:07:22+01:00, msvensson@stripped +2 -0
  Bug#21781 Replication slave io thread hangs
   - Add test case that shows how slave server hangs in "STOP SLAVE"
     when run on MySQL version 5.0.33 compiled with OpenSSL.
     Works fine with latest version of MySQL since that problem
     has been fixed by patch for bug#24148. The fix has been noted in
     the changelog for MySQL 5.0.36

  mysql-test/r/rpl_ssl.result@stripped, 2007-03-05 10:07:21+01:00, msvensson@stripped +93 -0
    New BitKeeper file ``mysql-test/r/rpl_ssl.result''

  mysql-test/r/rpl_ssl.result@stripped, 2007-03-05 10:07:21+01:00, msvensson@stripped +0 -0

  mysql-test/t/rpl_ssl.test@stripped, 2007-03-05 10:07:21+01:00, msvensson@stripped +60 -0
    New BitKeeper file ``mysql-test/t/rpl_ssl.test''

  mysql-test/t/rpl_ssl.test@stripped, 2007-03-05 10:07:21+01:00, msvensson@stripped +0 -0

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/bug21781/my50-bug21781
--- New file ---
+++ mysql-test/r/rpl_ssl.result	07/03/05 10:07:21
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	#

--- New file ---
+++ mysql-test/t/rpl_ssl.test	07/03/05 10:07:21
source include/have_ssl.inc;
source include/master-slave.inc;

# create a user for replication that requires ssl encryption
connection master;
grant replication slave on *.* to replssl@localhost require ssl;
create table t1 (t int auto_increment, KEY(t));

sync_slave_with_master;

# Set slave to use SSL for connection to master
stop slave;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval 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;

# Switch to master and insert one record, then sync it to slave
connection master;
insert into t1 values(1);
sync_slave_with_master;

# The record should now be on slave
select * from t1;

# The slave is synced and waiting/reading from master
# SHOW SLAVE STATUS will show "Waiting for master to send event"
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 8 # 9 # 23 # 33 #
query_vertical show slave status;

# Stop the slave, as reported in bug#21871 it would hang
STOP SLAVE;

select * from t1;

# Do the same thing a number of times
disable_query_log;
let $i= 100;
while ($i)
{
  start slave;
  connection master;
  insert into t1 values (NULL);
  connection slave;
  stop slave;
  dec $i;
}
start slave;
enable_query_log;
connection master;
sync_slave_with_master;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 8 # 9 # 23 # 33 #
query_vertical show slave status;