Commit fa7ed076 authored by unknown's avatar unknown
Browse files

patch for bug 10780 


sql/slave.cc:
  bug 10780
sql/slave.h:
  bug 10780
mysql-test/r/rpl_slave_status.result:
  New BitKeeper file ``mysql-test/r/rpl_slave_status.result''
parent 4456ae32

mysql-test/r/rpl_slave_status.result

0 → 100644
+23 −0
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;

grant replication slave on *.* to rpl@127.0.0.1 identified by 'rpl';

stop slave;

change master to master_user='rpl',master_password='rpl';

start slave;

drop table if exists t1;

create table t1 (n int);

insert into t1 values (1);

select * from t1;

n

1

delete from mysql.user where user='rpl';

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

sql/slave.cc

+3 −2
Original line number Diff line number Diff line
@@ -2186,7 +2186,8 @@ int show_master_info(THD* thd, MASTER_INFO* mi) 
		    &my_charset_bin);

    protocol->store((ulonglong) mi->rli.group_relay_log_pos);

    protocol->store(mi->rli.group_master_log_name, &my_charset_bin);

    protocol->store(mi->slave_running ? "Yes":"No", &my_charset_bin);

    protocol->store(mi->slave_running == MYSQL_SLAVE_RUN_CONNECT

        ? "Yes":"No", &my_charset_bin);

    protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin);

    protocol->store(&replicate_do_db);

    protocol->store(&replicate_ignore_db);
@@ -3078,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 = 1;

  mi->slave_running = MYSQL_SLAVE_RUN_INIT;

  mi->abort_slave = 0;

  pthread_mutex_unlock(&mi->run_lock);

  pthread_cond_broadcast(&mi->start_cond);

sql/slave.h

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



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