Commit c2db8a7f authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

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


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_binlog_ddl_multi.test:
  Auto merged
sql/rpl_injector.cc:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  manual merge
parents a264a79e 9376ec63

mysql-test/r/ndb_binlog_basic.result

+0 −11
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ select inserts,updates,deletes from 
cluster.binlog_index where epoch > @max_epoch and updates > 0;

inserts	updates	deletes

2	1	1

select schemaops from 

cluster.binlog_index where epoch > @max_epoch and schemaops > 0;

schemaops

1

1

1

flush logs;

purge master logs before now();

select count(*) from cluster.binlog_index;
@@ -55,8 +49,3 @@ select inserts,updates,deletes from 
cluster.binlog_index where epoch > @max_epoch and inserts > 0;

inserts	updates	deletes

2	0	0
 
select schemaops from

cluster.binlog_index where epoch > @max_epoch and schemaops > 0;

schemaops

1

1

mysql-test/r/ndb_binlog_ddl_multi.result

+2 −29
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ reset master; 
alter table t2 add column (b int);

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; alter table t2 add column (b int)

reset master;

reset master;
@@ -35,10 +31,6 @@ drop table mysqltest.t1; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	ALTER DATABASE mysqltest CHARACTER SET latin1

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	cluster.apply_status

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`

reset master;

reset master;
@@ -118,10 +110,6 @@ master-bin1.000001 # Query # # DROP TABLESPACE ts1 
ENGINE = NDB

master-bin1.000001	#	Query	#	#	DROP LOGFILE GROUP lg1 

ENGINE =NDB

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; drop table `t1`

reset master;

show tables;
@@ -138,25 +126,9 @@ Log_name Pos Event_type Server_id End_log_pos Info 
master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int key) engine=ndb

master-bin1.000001	#	Query	#	#	use `test`; create table t2 (a int key) engine=ndb

master-bin1.000001	#	Query	#	#	use `test`; create table t3 (a int key) engine=ndb

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; rename table `test.t3` to `test.t4`

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; rename table `test.t2` to `test.t3`

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; rename table `test.t1` to `test.t2`

master-bin1.000001	#	Query	#	#	BEGIN

master-bin1.000001	#	Table_map	#	#	cluster.apply_status

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

master-bin1.000001	#	Query	#	#	use `test`; rename table `test.t4` to `test.t1`

drop table t1;

drop table t2;
@@ -171,6 +143,7 @@ create table t1 (a int key) engine=ndb; 
insert into t1 values(1);

rename table t1 to t2;

insert into t2 values(2);

drop table t2;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin1.000001	#	Query	#	#	use `test`; create table t1 (a int key) engine=ndb
@@ -187,4 +160,4 @@ master-bin1.000001 # Write_rows # # 
master-bin1.000001	#	Table_map	#	#	test.t2

master-bin1.000001	#	Write_rows	#	#	

master-bin1.000001	#	Query	#	#	COMMIT

drop table t2;
 
master-bin1.000001	#	Query	#	#	use `test`; drop table `t2`

mysql-test/r/ndb_binlog_multi.result

+0 −2
Original line number Diff line number Diff line
@@ -33,11 +33,9 @@ cluster.binlog_index ORDER BY epoch DESC LIMIT 1; 
SELECT inserts,updates,deletes,schemaops FROM

cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;

inserts	updates	deletes	schemaops

0	0	0	1

drop table t1;

SHOW TABLES;

Tables_in_test

SELECT inserts,updates,deletes,schemaops FROM

cluster.binlog_index WHERE epoch > <the_epoch> AND epoch < <the_epoch2>;

inserts	updates	deletes	schemaops
 
0	0	0	1

mysql-test/r/rpl_ndb_log.result

+5 −5
Original line number Diff line number Diff line
@@ -83,12 +83,12 @@ master-bin.000002 # Write_rows 1 # 
master-bin.000002	#	Query	1	#	COMMIT

show binary logs;

Log_name	File_size

master-bin.000001	1722

master-bin.000002	603

master-bin.000001	1698

master-bin.000002	591

start slave;

show binary logs;

Log_name	File_size

slave-bin.000001	1817

slave-bin.000001	1793

slave-bin.000002	198

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

Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -102,13 +102,13 @@ slave-bin.000001 # Write_rows 2 # 
slave-bin.000001	#	Query	2	#	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	1	#	use `test`; create table t3 (a int)ENGINE=NDB

slave-bin.000001	#	Query	2	#	BEGIN

slave-bin.000001	#	Table_map	2	#	cluster.apply_status

slave-bin.000001	#	Write_rows	2	#	

slave-bin.000001	#	Table_map	2	#	test.t1

slave-bin.000001	#	Write_rows	2	#	

slave-bin.000001	#	Query	2	#	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
@@ -122,7 +122,7 @@ slave-bin.000002 # Write_rows 2 # 
slave-bin.000002	#	Query	2	#	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	603	#	#	master-bin.000002	Yes	Yes				#			0		0	603	#	None		0	No						#

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

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

ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log

DROP TABLE t1;

mysql-test/t/disabled.def

+3 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ events : test case unstable. andrey will fix 
#ndb_alter_table_row    : sometimes wrong error 1015!=1046

ndb_autodiscover        : Needs to be fixed w.r.t binlog

ndb_autodiscover2       : Needs to be fixed w.r.t binlog

ndb_binlog_basic        : Results are not deterministic, Tomas will fix

ndb_binlog_ddl_multi    : Bug#17038 [PATCH PENDING]

#ndb_binlog_basic        : Results are not deterministic, Tomas will fix

#ndb_binlog_ddl_multi    : Bug#17038 [PATCH PENDING]

ndb_load                : Bug#17233

partition_03ndb         : Bug#16385

ps_7ndb                 : dbug assert in RBR mode when executing test suite
@@ -33,7 +33,7 @@ rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk 
rpl_ndb_innodb2ndb      : Bugs#17400: delete & update of rows in table without pk fails

rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296

rpl_ndb_myisam2ndb      : Bugs#17400: delete & update of rows in table without pk fails

rpl_ndb_log             : result not deterministic

#rpl_ndb_log             : result not deterministic

rpl_ndb_relay_space     : Bug#16993

rpl_ndb_multi_update2   : BUG#17738 In progress

rpl_ndb_multi_update3   : Bug#17400: delete & update of rows in table without pk fails