• unknown's avatar
    BUG#24954 (Last_errno and Last_error not set after master_retry_count has · abbf5941
    unknown authored
    been reached):
    
    Post-merge patch to handle all the changes to the tree since the tree
    was cloned.
    
    
    mysql-test/extra/rpl_tests/rpl_log.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/extra/rpl_tests/rpl_max_relay_size.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/extra/rpl_tests/rpl_reset_slave.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/include/show_slave_status.inc:
      Column change.
    mysql-test/r/rpl_000015.result:
      Result file change.
    mysql-test/r/rpl_change_master.result:
      Result file change.
    mysql-test/r/rpl_empty_master_crash.result:
      Result file change.
    mysql-test/r/rpl_extraCol_innodb.result:
      Result file change.
    mysql-test/r/rpl_extraCol_myisam.result:
      Result file change.
    mysql-test/r/rpl_flushlog_loop.result:
      Result file change.
    mysql-test/r/rpl_incident.result:
      Result file change.
    mysql-test/r/rpl_known_bugs_detection.result:
      Result file change.
    mysql-test/r/rpl_loaddata.result:
      Result file change.
    mysql-test/r/rpl_loaddata_fatal.result:
      Result file change.
    mysql-test/r/rpl_log_pos.result:
      Result file change.
    mysql-test/r/rpl_ndb_basic.result:
      Result file change.
    mysql-test/r/rpl_ndb_circular.result:
      Result file change.
    mysql-test/r/rpl_ndb_extraCol.result:
      Result file change.
    mysql-test/r/rpl_ndb_idempotent.result:
      Result file change.
    mysql-test/r/rpl_ndb_log.result:
      Result file change.
    mysql-test/r/rpl_ndb_sync.result:
      Result file change.
    mysql-test/r/rpl_rbr_to_sbr.result:
      Result file change.
    mysql-test/r/rpl_redirect.result:
      Result file change.
    mysql-test/r/rpl_replicate_do.result:
      Result file change.
    mysql-test/r/rpl_rotate_logs.result:
      Result file change.
    mysql-test/r/rpl_row_inexist_tbl.result:
      Result file change.
    mysql-test/r/rpl_row_log.result:
      Result file change.
    mysql-test/r/rpl_row_log_innodb.result:
      Result file change.
    mysql-test/r/rpl_row_max_relay_size.result:
      Result file change.
    mysql-test/r/rpl_row_reset_slave.result:
      Result file change.
    mysql-test/r/rpl_row_tabledefs_2myisam.result:
      Result file change.
    mysql-test/r/rpl_row_tabledefs_3innodb.result:
      Result file change.
    mysql-test/r/rpl_row_until.result:
      Result file change.
    mysql-test/r/rpl_server_id1.result:
      Result file change.
    mysql-test/r/rpl_server_id2.result:
      Result file change.
    mysql-test/r/rpl_slave_skip.result:
      Result file change.
    mysql-test/r/rpl_ssl.result:
      Result file change.
    mysql-test/r/rpl_ssl1.result:
      Result file change.
    mysql-test/r/rpl_stm_log.result:
      Result file change.
    mysql-test/r/rpl_stm_max_relay_size.result:
      Result file change.
    mysql-test/r/rpl_stm_reset_slave.result:
      Result file change.
    mysql-test/r/rpl_stm_until.result:
      Result file change.
    mysql-test/t/rpl_000015.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_change_master.test:
      Column position change.
      Making result of SHOW SLAVE STATUS vertical.
    mysql-test/t/rpl_empty_master_crash.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_log_pos.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_ndb_basic.test:
      Column position change.
    mysql-test/t/rpl_ndb_idempotent.test:
      Column position change.
    mysql-test/t/rpl_ndb_sync.test:
      Column position change.
      Making result of SHOW SLAVE STATUS vertical.
    mysql-test/t/rpl_redirect.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_replicate_do.test:
      Column position change.
      Making result of SHOW SLAVE STATUS vertical.
    mysql-test/t/rpl_rotate_logs.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_row_inexist_tbl.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_row_until.test:
      Replacing SHOW SLAVE STATUS with include file.
    mysql-test/t/rpl_server_id1.test:
      Column position change.
      Making result of SHOW SLAVE STATUS vertical.
    mysql-test/t/rpl_server_id2.test:
      Column position change.
      Making result of SHOW SLAVE STATUS vertical.
    mysql-test/t/rpl_slave_status.test:
      Column position change.
    mysql-test/t/rpl_ssl.test:
      Column position change.
    mysql-test/t/rpl_ssl1.test:
      Column position change.
    mysql-test/t/rpl_stm_until.test:
      Replacing SHOW SLAVE STATUS with include file.
    sql/log_event.cc:
      Using member function last_error() instead of member variable.
      Replacing use of 'table' with 'm_table'.
      Suppressing warnings in debug printout.
      Setting thd->net.last_error on error return from unpack_row() to get
      a non-zero error message.  The error codes for are being harmonized
      in another worklog.
      Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
    sql/rpl_mi.h:
      Moving order of include files since they are dependent (!).
    sql/rpl_record.cc:
      Adding missing include file.
      Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
    sql/rpl_record_old.cc:
      Adding missing include file.
      Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
    sql/rpl_reporting.cc:
      Adding const modifier to member function.
      Using renamed member variable m_last_error.
    sql/rpl_reporting.h:
      Adding missing constant MAX_SLAVE_ERRMSG.
      Adding const modifier to Slave_reporting_capability::report().
      Hiding and renaming member variable last_error and incorporating
      member function for access in order to make it mutable.
    sql/rpl_rli.h:
      Moving constant MAX_SLAVE_ERRMSG.
    sql/rpl_utility.cc:
      Adding missing include file rpl_rli.h.
    sql/slave.cc:
      Replacing use of member variable last_error with call to member function
      last_error().
      Replacing use of slave_print_msg() with RELAY_LOG_INFO::report().
    abbf5941
rpl_server_id1.result 1.12 KB
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;
create table t1 (n int);
reset master;
stop slave;
change master to master_port=SLAVE_PORT;
show slave status;
Slave_IO_State	
Master_Host	127.0.0.1
Master_User	root
Master_Port	SLAVE_PORT
Connect_Retry	1
Master_Log_File	
Read_Master_Log_Pos	4
Relay_Log_File	slave-relay-bin.000001
Relay_Log_Pos	4
Relay_Master_Log_File	
Slave_IO_Running	No
Slave_SQL_Running	No
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	0
Relay_Log_Space	106
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
Master_SSL_Verify_Server_Cert	No
Last_IO_Errno	#
Last_IO_Error	#
Last_SQL_Errno	0
Last_SQL_Error	
start slave;
insert into t1 values (1);
show status like "slave_running";
Variable_name	Value
Slave_running	OFF
drop table t1;