diff options
author | unknown <kostja@vajra.(none)> | 2007-04-13 23:53:05 -0400 |
---|---|---|
committer | unknown <kostja@vajra.(none)> | 2007-04-13 23:53:05 -0400 |
commit | 627202b4c6c8db1207501918b2a23b53acdaaae0 (patch) | |
tree | 80a138b97ff91b9b6181aec552a578672c0ca8c8 /mysql-test/r/rpl_events.result | |
parent | ea2d0a980383fa78af33a31c63dda91530a33e2b (diff) | |
download | mariadb-git-627202b4c6c8db1207501918b2a23b53acdaaae0.tar.gz |
Fix rpl_events test failure in the runtime tree.
mysql-test/r/rpl_events.result:
Now ON COMPLETION NOT PRESERVE events are also dropped on the
slave, since DROP EVENT command that is invoked for all such commands
gets invoked on the slave.
sql/event_data_objects.cc:
Fix the failing rpl_events test after the patch for Bug#27733.
At the time Events::drop_event got invoked inside
Event_job_data::execute() thd->query pointed to CREATE PROCEDURE
statement. This statement was written to the binary log
from inside Events::drop_event (under assumption that this is a
DROP EVENT statement that needs to be replicated), and caused
creation of this procedure on the slave (and a subsequent failure
when a procedure with the same name already exist).
The patch ensures that thd->query points at the right query text
for DROP EVENT executed when dropping ON COMPLETION NOT PRESERVE
events.
sql/event_data_objects.h:
Update a declaration.
sql/events.cc:
Change if () to an assert: thd->query now always points at a valid
query.
Diffstat (limited to 'mysql-test/r/rpl_events.result')
-rw-r--r-- | mysql-test/r/rpl_events.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_events.result b/mysql-test/r/rpl_events.result index bff1a814a6d..debfcce0072 100644 --- a/mysql-test/r/rpl_events.result +++ b/mysql-test/r/rpl_events.result @@ -34,7 +34,6 @@ id c ts affected rows: 2 SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce'; db name status originator -test justonce SLAVESIDE_DISABLED 1 DROP EVENT IF EXISTS test.slave_once; CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO INSERT INTO t1(c) VALUES ('from slave_once'); @@ -111,7 +110,6 @@ id c ts affected rows: 2 SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce'; db name status originator -test justonce SLAVESIDE_DISABLED 1 DROP EVENT IF EXISTS test.slave_once; CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO INSERT INTO t1(c) VALUES ('from slave_once'); |