Commit e1d1248d authored by aelkin/andrei@mysql1000.dsl.inet.fi's avatar aelkin/andrei@mysql1000.dsl.inet.fi
Browse files

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/BARE/mysql-5.1-bugteam
parents ee6373ab 9afdba04

mysql-test/include/rpl_events.inc

+7 −8
Original line number Diff line number Diff line
@@ -41,18 +41,17 @@ let $wait_condition= 


# check that table t1 contains something

--echo "Checking event data on the master"

--enable_info

--replace_column 3 TIMESTAMP

SELECT * FROM t1 ORDER BY id;

--disable_info

let $events_done=`SELECT count(*)  FROM t1 id`;

--disable_query_log

eval SELECT $events_done > 0 as ONE;

--enable_query_log



sync_slave_with_master;



--echo "Checking event data on the slave"

--enable_info

--replace_column 3 TIMESTAMP

SELECT * FROM t1 ORDER BY id;

--disable_info

--disable_query_log

eval SELECT count(*) - $events_done as ZERO FROM t1 id;

--enable_query_log



--echo "Checking event is inactive on slave"

SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';

mysql-test/suite/rpl/r/rpl_events.result

+8 −20
Original line number Diff line number Diff line
@@ -23,17 +23,11 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name 
db	name	status	originator

test	justonce	ENABLED	1

"Checking event data on the master"

SELECT * FROM t1 ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

ONE

1

"Checking event data on the slave"

SELECT * FROM t1 ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

ZERO

0

"Checking event is inactive on slave"

SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';

db	name	status	originator
@@ -118,17 +112,11 @@ SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name 
db	name	status	originator

test	justonce	ENABLED	1

"Checking event data on the master"

SELECT * FROM t1 ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

ONE

1

"Checking event data on the slave"

SELECT * FROM t1 ORDER BY id;

id	c	ts

1	manually	TIMESTAMP

2	from justonce	TIMESTAMP

affected rows: 2

ZERO

0

"Checking event is inactive on slave"

SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';

db	name	status	originator