Commit ec9b5eca authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl


sql/ha_ndbcluster_binlog.cc:
  Auto merged
parents 2d384ffe 502e5c93

mysql-test/r/ndb_binlog_discover.result

+11 −6
Original line number Diff line number Diff line
@@ -3,10 +3,15 @@ create table t1 (a int key) engine=ndb; 
reset master;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

master-bin.000001	#	Write_rows	#	#	table_id: #

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Incident	#	#	#1 (LOST_EVENTS)

master-bin.000001	#	Rotate	#	#	master-bin.000002;pos=4

PURGE MASTER LOGS TO 'master-bin.000002';

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000002	#	Query	#	#	BEGIN

master-bin.000002	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000002	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

master-bin.000002	#	Write_rows	#	#	table_id: #

master-bin.000002	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000002	#	Query	#	#	COMMIT

drop table t1;

mysql-test/r/rpl_ndb_log.result

+10 −10
Original line number Diff line number Diff line
@@ -99,33 +99,33 @@ show binlog events in 'slave-bin.000001' from 4; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; drop table t1

slave-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=NDB

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Query	1	#	BEGIN

slave-bin.000001	#	Table_map	2	#	table_id: # (test.t1)

slave-bin.000001	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	2	#	table_id: #

slave-bin.000001	#	Write_rows	2	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	2	#	COMMIT

slave-bin.000001	#	Write_rows	1	#	table_id: #

slave-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000001	#	Query	1	#	COMMIT

slave-bin.000001	#	Query	1	#	use `test`; create table t3 (a int)ENGINE=NDB

slave-bin.000001	#	Rotate	2	#	slave-bin.000002;pos=4

show binlog events in 'slave-bin.000002' from 4;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

slave-bin.000002	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4

slave-bin.000002	#	Query	1	#	use `test`; create table t2 (n int)ENGINE=NDB

slave-bin.000002	#	Query	2	#	BEGIN

slave-bin.000002	#	Query	1	#	BEGIN

slave-bin.000002	#	Table_map	2	#	table_id: # (test.t2)

slave-bin.000002	#	Table_map	2	#	table_id: # (mysql.ndb_apply_status)

slave-bin.000002	#	Write_rows	2	#	table_id: #

slave-bin.000002	#	Write_rows	2	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Query	2	#	COMMIT

slave-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F

slave-bin.000002	#	Query	1	#	COMMIT

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

#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	617	#	#	master-bin.000002	Yes	Yes				#			0		0	617	#	None		0	No						#

mysql-test/t/ndb_binlog_discover.test

+3 −0
Original line number Diff line number Diff line
@@ -29,5 +29,8 @@ while ($mysql_errno) 
}

--enable_query_log



--source include/show_binlog_events.inc

PURGE MASTER LOGS TO 'master-bin.000002';



--source include/show_binlog_events.inc

drop table t1;

sql/ha_ndbcluster_binlog.cc

+8 −0
Original line number Diff line number Diff line
@@ -3589,6 +3589,14 @@ pthread_handler_t ndb_binlog_thread_func(void *arg) 
  /*

    Main NDB Injector loop

  */

  {

    /*

      Always insert a GAP event as we cannot know what has happened in the cluster

      while not being connected.

    */

    LEX_STRING const msg= { C_STRING_WITH_LEN("Cluster connect") };

    inj->record_incident(thd, INCIDENT_LOST_EVENTS, msg);

  }

  {

    thd->proc_info= "Waiting for ndbcluster to start";

sql/rpl_injector.cc

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int injector::record_incident(THD *thd, Incident incident) 
  return 0;

}



int injector::record_incident(THD *thd, Incident incident, LEX_STRING message)

int injector::record_incident(THD *thd, Incident incident, LEX_STRING const message)

{

  Incident_log_event ev(thd, incident, message);

  if (int error= mysql_bin_log.write(&ev))