database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge damien-katzs-computer.local:/Users/dkatz/mysql51

Browse Source 
into  damien-katzs-computer.local:/Users/dkatz/51_win
This commit is contained in:
dkatz@damien-katzs-computer.local
2007-06-14 20:48:11 -04:00
parent 65e47d59db 471173c57c
commit 3a1a561322
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/rpl_events.result
View File

@ -157,3 +157,9 @@ test slave_terminate SLAVESIDE_DISABLED 2
DROP EVENT test.slave_terminate; DROP EVENT test.slave_terminate;
"in the master" "in the master"
DROP TABLE t1; DROP TABLE t1;
CREATE EVENT event1 ON SCHEDULE EVERY 1 YEAR
DO BEGIN
select * from t1;
END;|
ALTER EVENT event1 RENAME TO event2;
DROP EVENT event2;

23
mysql-test/t/rpl_events.test
View File

@ -22,3 +22,26 @@ set binlog_format=statement;
# Embedded server doesn't support binlogging # Embedded server doesn't support binlogging
--source include/rpl_events.inc --source include/rpl_events.inc
#
# Bug #28953 Using events in a replication let the slave crash.
#
connection master;
DELIMITER |;
CREATE EVENT event1 ON SCHEDULE EVERY 1 YEAR
DO BEGIN
select * from t1;
END;|
DELIMITER ;|
ALTER EVENT event1 RENAME TO event2;
sync_slave_with_master;
connection master;
DROP EVENT event2;
sync_slave_with_master;

2
sql/sql_parse.cc
View File

@ -1569,7 +1569,7 @@ bool sp_process_definer(THD *thd)
if (lex->definer == NULL) if (lex->definer == NULL)
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
if (thd->slave_thread) if (thd->slave_thread && lex->sphead)
lex->sphead->m_chistics->suid= SP_IS_NOT_SUID; lex->sphead->m_chistics->suid= SP_IS_NOT_SUID;
} }
else else