Commit 63e9a87a authored by unknown's avatar unknown
Browse files

updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 

to connect


mysql-test/r/rpl_slave_status.result:
  updated result
mysql-test/t/rpl_slave_status.test:
  user vertical result
sql/slave.cc:
  reversed an unnecessary change for BUG#10780
sql/slave.h:
  reversed an unnecessary change for BUG#10780
parent 26547b33

mysql-test/r/rpl_slave_status.result

+33 −2
Original line number Diff line number Diff line
@@ -19,5 +19,36 @@ flush privileges; 
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

mysql-test/t/rpl_slave_status.test

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ connection slave; 
stop slave;

start slave;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--vertical_results

show slave status;



# end of 4.1 tests

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -3079,7 +3079,7 @@ extern "C" pthread_handler_decl(handle_slave_io,arg) 
  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);

sql/slave.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ enum enum_binlog_formats { 
#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



/****************************************************************************