Commit fa449d58 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new-ndb 

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb
parents 574bce49 245b1812

mysql-test/r/bdb_notembedded.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
set autocommit=1;

reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

drop table bug16206;

reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb

f	n	Query	1	n	use `test`; insert into bug16206 values(0)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; BEGIN

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

f	n	Query	1	n	use `test`; COMMIT

f	n	Query	1	n	use `test`; insert into bug16206 values(3)

drop table bug16206;

set autocommit=0;

End of 5.0 tests

mysql-test/suite/rpl_ndb/r/rpl_ndb_apply_status.result

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

*** on slave there should be zero rows ***

select count(*) from mysql.ndb_apply_status;

count(*)

0

create table t1 (a int key, b int) engine ndb;

insert into t1 values (1,1);

*** on master it should be empty ***

select * from mysql.ndb_apply_status;

server_id	epoch	log_name	start_pos	end_pos

*** on slave there should be one row ***

select count(*) from mysql.ndb_apply_status;

count(*)

1

drop table t1;

mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--replicate_ignore_db=mysql

mysql-test/suite/rpl_ndb/t/rpl_ndb_apply_status.test

0 → 100644
+26 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_binlog_format_row.inc

-- source include/ndb_master-slave.inc



#

# Bug#28170 replicate-ignore-db=mysql should not ignore mysql.ndb_apply_status

#

# Slave is started with --replicate-ignore-db=mysql

#

sync_slave_with_master;

echo *** on slave there should be zero rows ***;

select count(*) from mysql.ndb_apply_status;



connection master;

create table t1 (a int key, b int) engine ndb;

insert into t1 values (1,1);

echo *** on master it should be empty ***;

select * from mysql.ndb_apply_status;



sync_slave_with_master;

echo *** on slave there should be one row ***;

select count(*) from mysql.ndb_apply_status;



connection master;

drop table t1;

sync_slave_with_master;

mysql-test/t/bdb_notembedded.test

0 → 100644
+38 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc

-- source include/have_bdb.inc



#

# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode

#

set autocommit=1;



let $VERSION=`select version()`;



reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



set autocommit=0;





--echo End of 5.0 tests