List:Internals« Previous MessageNext Message »
From:sasha Date:July 30 2005 3:00am
Subject:bk commit into 4.1 tree (sasha:1.2358) BUG#10780
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of sasha. When sasha 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
  1.2358 05/07/29 21:00:28 sasha@stripped +4 -0
  updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
  to connect

  sql/slave.h
    1.87 05/07/29 21:00:25 sasha@stripped +0 -1
    reversed an unnecessary change for BUG#10780

  sql/slave.cc
    1.274 05/07/29 21:00:25 sasha@stripped +1 -1
    reversed an unnecessary change for BUG#10780

  mysql-test/t/rpl_slave_status.test
    1.2 05/07/29 21:00:25 sasha@stripped +1 -0
    user vertical result

  mysql-test/r/rpl_slave_status.result
    1.2 05/07/29 21:00:25 sasha@stripped +33 -2
    updated result

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-4.1

--- 1.273/sql/slave.cc	2005-07-28 19:07:32 -06:00
+++ 1.274/sql/slave.cc	2005-07-29 21:00:25 -06:00
@@ -3079,7 +3079,7 @@
   pthread_mutex_lock(&LOCK_thread_count);
   threads.append(thd);
   pthread_mutex_unlock(&LOCK_thread_count);
-  mi->slave_running = MYSQL_SLAVE_RUN_INIT;
+  mi->slave_running = 1;
   mi->abort_slave = 0;
   pthread_mutex_unlock(&mi->run_lock);
   pthread_cond_broadcast(&mi->start_cond);

--- 1.1/mysql-test/r/rpl_slave_status.result	2005-07-28 19:07:33 -06:00
+++ 1.2/mysql-test/r/rpl_slave_status.result	2005-07-29 21:00:25 -06:00
@@ -19,5 +19,36 @@
 stop slave;
 start slave;
 show slave status;
-Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-Connecting to master	127.0.0.1	rpl	MASTER_MYPORT	1	master-bin.000001	357	slave-relay-bin.000001	401	master-bin.000001	No	Yes							0		0	357	401	None		0	No						NULL
+Slave_IO_State	Connecting to master
+Master_Host	127.0.0.1
+Master_User	rpl
+Master_Port	MASTER_MYPORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	357
+Relay_Log_File	slave-relay-bin.000001
+Relay_Log_Pos	401
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	No
+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	357
+Relay_Log_Space	401
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	NULL

--- 1.1/mysql-test/t/rpl_slave_status.test	2005-07-28 19:10:45 -06:00
+++ 1.2/mysql-test/t/rpl_slave_status.test	2005-07-29 21:00:25 -06:00
@@ -23,6 +23,7 @@
 stop slave;
 start slave;
 --replace_result $MASTER_MYPORT MASTER_MYPORT
+--vertical_results
 show slave status;
 
 # end of 4.1 tests

--- 1.86/sql/slave.h	2005-07-28 19:07:33 -06:00
+++ 1.87/sql/slave.h	2005-07-29 21:00:25 -06:00
@@ -112,7 +112,6 @@
 #define MYSQL_SLAVE_NOT_RUN         0
 #define MYSQL_SLAVE_RUN_NOT_CONNECT 1
 #define MYSQL_SLAVE_RUN_CONNECT     2
-#define MYSQL_SLAVE_RUN_INIT        3
 
 /****************************************************************************
 
Thread
bk commit into 4.1 tree (sasha:1.2358) BUG#10780sasha30 Jul