WL#3629 - Replication of Invocation and Invoked Features

This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.

The only code change is to correct references to the classname in
enums.
This commit is contained in:
cbell/Chuck@mysql_cab_desk. 2007-03-29 11:11:28 -04:00
commit 0322284f92
7 changed files with 62 additions and 62 deletions

View file

@ -683,12 +683,12 @@ INSERT INTO t1 VALUES(1, 'test1');
CREATE EVENT e1 ON SCHEDULE EVERY '1' SECOND COMMENT 'e_second_comment' DO DELETE FROM t1;
==========MASTER==========
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e1 root@localhost RECURRING NULL 1 SECOND # # ENABLED
==========SLAVE===========
USE test_rpl;
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
==========MASTER==========
SELECT COUNT(*) FROM t1;
COUNT(*)
@ -742,12 +742,12 @@ a b
ALTER EVENT e1 RENAME TO e2;
==========MASTER==========
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
test_rpl e2 root@localhost RECURRING NULL 1 SECOND # # ENABLED
==========SLAVE===========
USE test_rpl;
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
==========MASTER==========
SELECT COUNT(*) FROM t1;
COUNT(*)
@ -776,11 +776,11 @@ a b
DROP EVENT e2;
==========MASTER==========
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
==========SLAVE===========
USE test_rpl;
SHOW EVENTS;
Db Name Definer Type Execute at Interval value Interval field Starts Ends Status
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator
DELETE FROM t1;
DELETE FROM t2;