mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

WL#3629 - Replication of Invocation and Invoked Features

Browse source 
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct 
problems found during the recalculation of next execution of events in RBR.


mysql-test/include/rpl_events.inc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch changes the rpl_events test to be more comprehensive in catching
  errors as a result of RBR. Changes include clarification of SELECTs with
  WHERE clauses and synchronization with master and slave.
mysql-test/r/rpl_events.result:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch changes the results for the rpl_events test to accomodate the changes
  in the test.
scripts/mysql_system_tables.sql:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch adds the originator column and a new enum value to the mysql.event table.
  This change was necessary to accomodate changes as a result of other patches.
sql/event_data_objects.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  The status check was changed to include either ENABLED or DISABLED in the
  gate to change the status to SLAVESIDE_DISABLED for events replicated to 
  the slave.
  
  This patch also includes an update to correct a problem encountered during
  testing after the local merge. The update_timing_fields method is replicating
  the timing changes in RBR to the slave thereby over writing the change to the
  status column in the process. This code includes a check to turn off the next
  binlog event if in RBR.
sql/event_queue.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  The code was corrected to include both types of disabled status enums
  (DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
sql/sql_show.cc:
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch corrects an error in merging that occurred during manual merge.
  It corrects the order in which the originator column appears in the show
  structures. The error caused incorrect output on SHOW EVENTS commands.
This commit is contained in:
unknown 2007-03-29 08:17:19 -04:00
parent ff1d6b2252
commit 75686dc73f
6 changed files with 80 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
mysql-test/include/rpl_events.inc
View file

@ -6,7 +6,7 @@
################################################################## ##################################################################
--disable_warnings --disable_warnings
DROP EVENT IF EXISTS justonce; DROP EVENT IF EXISTS test.justonce;
drop table if exists t1,t2; drop table if exists t1,t2;
--enable_warnings --enable_warnings
@ -23,9 +23,11 @@ CURRENT_TIMESTAMP,
INSERT INTO t1 (c) VALUES ('manually'); INSERT INTO t1 (c) VALUES ('manually');
# then, we create the event # then, we create the event
CREATE EVENT justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTo t1 CREATE EVENT test.justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTO t1
(c) VALUES ('from justonce'); (c) VALUES ('from justonce');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
# wait 3 seconds, so the event can trigger # wait 3 seconds, so the event can trigger
--real_sleep 3 --real_sleep 3
@ -37,7 +39,6 @@ SELECT * FROM t1;
--disable_info --disable_info
sync_slave_with_master; sync_slave_with_master;
connection slave;
--echo "in the slave" --echo "in the slave"
--enable_info --enable_info
@ -45,6 +46,8 @@ connection slave;
SELECT * FROM t1; SELECT * FROM t1;
--disable_info --disable_info
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
# Create an event on the slave and check to see what the originator is. # Create an event on the slave and check to see what the originator is.
--disable_warnings --disable_warnings
DROP EVENT IF EXISTS test.slave_once; DROP EVENT IF EXISTS test.slave_once;
@ -52,7 +55,7 @@ DROP EVENT IF EXISTS test.slave_once;
CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO
INSERT INTO t1(c) VALUES ('from slave_once'); INSERT INTO t1(c) VALUES ('from slave_once');
SELECT db, name, status, originator FROM mysql.event; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_once';
--disable_warnings --disable_warnings
DROP EVENT IF EXISTS test.slave_once; DROP EVENT IF EXISTS test.slave_once;
@ -61,39 +64,40 @@ DROP EVENT IF EXISTS test.slave_once;
connection master; connection master;
# BUG#20384 - disable events on slave # BUG#20384 - disable events on slave
--disable_warnings
DROP EVENT IF EXISTS test.justonce; DROP EVENT IF EXISTS test.justonce;
--enable_warnings
CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO
INSERT INTO t1(c) VALUES ('from er'); INSERT INTO t1(c) VALUES ('from er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
sync_slave_with_master; sync_slave_with_master;
connection slave;
--echo "in the slave" --echo "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
connection master; connection master;
--echo "in the master" --echo "in the master"
ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er'); ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
sync_slave_with_master; sync_slave_with_master;
connection slave;
--echo "in the slave" --echo "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
connection master; connection master;
--echo "in the master" --echo "in the master"
DROP EVENT test.er; DROP EVENT test.er;
--replace column 8 DATETIME SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er';
--disable_info --disable_info
sync_slave_with_master; sync_slave_with_master;
connection slave;
--echo "in the slave" --echo "in the slave"
--replace column 8 DATETIME SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er';
--echo "in the master" --echo "in the master"
connection master; connection master;

86
mysql-test/r/rpl_events.result
View file

@ -6,7 +6,7 @@ reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
set binlog_format=row; set binlog_format=row;
DROP EVENT IF EXISTS justonce; DROP EVENT IF EXISTS test.justonce;
drop table if exists t1,t2; drop table if exists t1,t2;
CREATE TABLE `t1` ( CREATE TABLE `t1` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@ -16,8 +16,11 @@ CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO t1 (c) VALUES ('manually'); INSERT INTO t1 (c) VALUES ('manually');
CREATE EVENT justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTo t1 CREATE EVENT test.justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTO t1
(c) VALUES ('from justonce'); (c) VALUES ('from justonce');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
db name status originator
test justonce ENABLED 1
"in the master" "in the master"
SELECT * FROM t1; SELECT * FROM t1;
id c ts id c ts
@ -30,46 +33,46 @@ id c ts
1 manually TIMESTAMP 1 manually TIMESTAMP
2 from justonce TIMESTAMP 2 from justonce TIMESTAMP
affected rows: 2 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; DROP EVENT IF EXISTS test.slave_once;
CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO
INSERT INTO t1(c) VALUES ('from slave_once'); INSERT INTO t1(c) VALUES ('from slave_once');
SELECT db, name, status, originator FROM mysql.event; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_once';
db name status originator db name status originator
test justonce SLAVESIDE_DISABLED 1
test slave_once ENABLED 2 test slave_once ENABLED 2
DROP EVENT IF EXISTS test.slave_once; DROP EVENT IF EXISTS test.slave_once;
DROP EVENT IF EXISTS test.justonce; DROP EVENT IF EXISTS test.justonce;
Warnings:
Note 1305 Event justonce does not exist
CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO
INSERT INTO t1(c) VALUES ('from er'); INSERT INTO t1(c) VALUES ('from er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er ENABLED 1 test er ENABLED 1 INSERT INTO t1(c) VALUES ('from er')
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er SLAVESIDE_DISABLED 1 test er SLAVESIDE_DISABLED 1 INSERT INTO t1(c) VALUES ('from er')
"in the master" "in the master"
ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er'); ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er ENABLED 1 test er ENABLED 1 INSERT into t1(c) VALUES ('from alter er')
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er SLAVESIDE_DISABLED 1 test er SLAVESIDE_DISABLED 1 INSERT into t1(c) VALUES ('from alter er')
"in the master" "in the master"
DROP EVENT test.er; DROP EVENT test.er;
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
db name status originator db name status originator
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
db name status originator db name status originator
"in the master" "in the master"
DROP TABLE t1; DROP TABLE t1;
set binlog_format=statement; set binlog_format=statement;
DROP EVENT IF EXISTS justonce; DROP EVENT IF EXISTS test.justonce;
drop table if exists t1,t2; drop table if exists t1,t2;
CREATE TABLE `t1` ( CREATE TABLE `t1` (
`id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,
@ -79,8 +82,11 @@ CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8; ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO t1 (c) VALUES ('manually'); INSERT INTO t1 (c) VALUES ('manually');
CREATE EVENT justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTo t1 CREATE EVENT test.justonce ON SCHEDULE AT NOW() + INTERVAL 2 SECOND DO INSERT INTO t1
(c) VALUES ('from justonce'); (c) VALUES ('from justonce');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
db name status originator
test justonce ENABLED 1
"in the master" "in the master"
SELECT * FROM t1; SELECT * FROM t1;
id c ts id c ts
@ -93,41 +99,41 @@ id c ts
1 manually TIMESTAMP 1 manually TIMESTAMP
2 from justonce TIMESTAMP 2 from justonce TIMESTAMP
affected rows: 2 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; DROP EVENT IF EXISTS test.slave_once;
CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO CREATE EVENT test.slave_once ON SCHEDULE EVERY 5 MINUTE DO
INSERT INTO t1(c) VALUES ('from slave_once'); INSERT INTO t1(c) VALUES ('from slave_once');
SELECT db, name, status, originator FROM mysql.event; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'slave_once';
db name status originator db name status originator
test justonce SLAVESIDE_DISABLED 1
test slave_once ENABLED 2 test slave_once ENABLED 2
DROP EVENT IF EXISTS test.slave_once; DROP EVENT IF EXISTS test.slave_once;
DROP EVENT IF EXISTS test.justonce; DROP EVENT IF EXISTS test.justonce;
Warnings:
Note 1305 Event justonce does not exist
CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO CREATE EVENT test.er ON SCHEDULE EVERY 3 SECOND DO
INSERT INTO t1(c) VALUES ('from er'); INSERT INTO t1(c) VALUES ('from er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er ENABLED 1 test er ENABLED 1 INSERT INTO t1(c) VALUES ('from er')
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er SLAVESIDE_DISABLED 1 test er SLAVESIDE_DISABLED 1 INSERT INTO t1(c) VALUES ('from er')
"in the master" "in the master"
ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er'); ALTER EVENT test.er ON SCHEDULE EVERY 5 SECOND DO INSERT into t1(c) VALUES ('from alter er');
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er ENABLED 1 test er ENABLED 1 INSERT into t1(c) VALUES ('from alter er')
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator, body FROM mysql.event WHERE db = 'test' AND name = 'er';
db name status originator db name status originator body
test er SLAVESIDE_DISABLED 1 test er SLAVESIDE_DISABLED 1 INSERT into t1(c) VALUES ('from alter er')
"in the master" "in the master"
DROP EVENT test.er; DROP EVENT test.er;
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
db name status originator db name status originator
"in the slave" "in the slave"
SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'er'; SELECT db, name, status, originator FROM mysql.event WHERE db = 'test';
db name status originator db name status originator
"in the master" "in the master"
DROP TABLE t1; DROP TABLE t1;

2
scripts/mysql_system_tables.sql
View file

@ -70,7 +70,7 @@ CALL create_slow_log_table();
DROP PROCEDURE create_slow_log_table; DROP PROCEDURE create_slow_log_table;
CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events'; CREATE TABLE IF NOT EXISTS event ( db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', name char(64) CHARACTER SET utf8 NOT NULL default '', body longblob NOT NULL, definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', execute_at DATETIME default NULL, interval_value int(11) default NULL, interval_field ENUM('YEAR','QUARTER','MONTH','DAY','HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR','DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND','DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND','SECOND_MICROSECOND') default NULL, created TIMESTAMP NOT NULL, modified TIMESTAMP NOT NULL, last_executed DATETIME default NULL, starts DATETIME default NULL, ends DATETIME default NULL, status ENUM('ENABLED','DISABLED','SLAVESIDE_DISABLED') NOT NULL default 'ENABLED', on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP', sql_mode set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') DEFAULT '' NOT NULL, comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '', originator int(10) NOT NULL, PRIMARY KEY (db, name) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';
CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM; CREATE TABLE IF NOT EXISTS ndb_binlog_index (Position BIGINT UNSIGNED NOT NULL, File VARCHAR(255) NOT NULL, epoch BIGINT UNSIGNED NOT NULL, inserts BIGINT UNSIGNED NOT NULL, updates BIGINT UNSIGNED NOT NULL, deletes BIGINT UNSIGNED NOT NULL, schemaops BIGINT UNSIGNED NOT NULL, PRIMARY KEY(epoch)) ENGINE=MYISAM;

10
sql/event_data_objects.cc
View file

@ -658,7 +658,8 @@ void Event_parse_data::check_originator_id(THD *thd)
(thd->system_thread == SYSTEM_THREAD_SLAVE_IO)) (thd->system_thread == SYSTEM_THREAD_SLAVE_IO))
{ {
DBUG_PRINT("info", ("Invoked object status set to SLAVESIDE_DISABLED.")); DBUG_PRINT("info", ("Invoked object status set to SLAVESIDE_DISABLED."));
if (status == Event_basic::ENABLED) if ((status == Event_basic::ENABLED) ||
(status == Event_basic::DISABLED))
status = Event_basic::SLAVESIDE_DISABLED; status = Event_basic::SLAVESIDE_DISABLED;
originator = thd->server_id; originator = thd->server_id;
} }
@ -1590,6 +1591,13 @@ Event_queue_element::update_timing_fields(THD *thd)
status_changed= FALSE; status_changed= FALSE;
} }
/*
Turn off row binlogging of event timing updates. These are not used
for RBR of events replicated to the slave.
*/
if (thd->current_stmt_binlog_row_based)
thd->clear_current_stmt_binlog_row_based();
if ((table->file->ha_update_row(table->record[1], table->record[0]))) if ((table->file->ha_update_row(table->record[1], table->record[0])))
ret= TRUE; ret= TRUE;

7
sql/event_queue.cc
View file

@ -197,8 +197,8 @@ Event_queue::create_event(THD *thd, Event_queue_element *new_element)
DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd, DBUG_PRINT("enter", ("thd: 0x%lx et=%s.%s", (long) thd,
new_element->dbname.str, new_element->name.str)); new_element->dbname.str, new_element->name.str));
if (res || new_element->status == Event_queue_element::DISABLED if ((new_element->status == Event_queue_element::DISABLED)
|| new_element->status == Event_queue_element::SLAVESIDE_DISABLED) || (new_element->status == Event_queue_element::SLAVESIDE_DISABLED))
delete new_element; delete new_element;
else else
{ {
@ -234,7 +234,8 @@ Event_queue::update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
DBUG_ENTER("Event_queue::update_event"); DBUG_ENTER("Event_queue::update_event");
DBUG_PRINT("enter", ("thd: 0x%lx et=[%s.%s]", (long) thd, dbname.str, name.str)); DBUG_PRINT("enter", ("thd: 0x%lx et=[%s.%s]", (long) thd, dbname.str, name.str));
if (new_element->status == Event_queue_element::DISABLED) if ((new_element->status == Event_queue_element::DISABLED) ||
(new_element->status == Event_queue_element::SLAVESIDE_DISABLED))
{ {
DBUG_PRINT("info", ("The event is disabled.")); DBUG_PRINT("info", ("The event is disabled."));
/* /*

2
sql/sql_show.cc
View file

@ -5447,8 +5447,8 @@ ST_FIELD_INFO events_fields_info[]=
{"CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0}, {"CREATED", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0},
{"LAST_ALTERED", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0}, {"LAST_ALTERED", 0, MYSQL_TYPE_TIMESTAMP, 0, 0, 0},
{"LAST_EXECUTED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0}, {"LAST_EXECUTED", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, 0},
{"ORIGINATOR", 10, MYSQL_TYPE_LONG, 0, 0, "Originator"},
{"EVENT_COMMENT", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0}, {"EVENT_COMMENT", NAME_LEN, MYSQL_TYPE_STRING, 0, 0, 0},
{"ORIGINATOR", 10, MYSQL_TYPE_LONG, 0, 0, "Originator"},
{0, 0, MYSQL_TYPE_STRING, 0, 0, 0} {0, 0, MYSQL_TYPE_STRING, 0, 0, 0}
}; };