mirror of
https://github.com/MariaDB/server.git
synced 2025-08-27 13:04:36 +03:00
Conflicts: Text conflict in .bzr-mysql/default.conf Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test Text conflict in mysql-test/r/mysqlbinlog2.result Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result Text conflict in mysql-test/suite/rpl/r/rpl_udf.result Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test Text conflict in sql/field.h Text conflict in sql/log.cc Text conflict in sql/log_event.cc Text conflict in sql/log_event_old.cc Text conflict in sql/mysql_priv.h Text conflict in sql/share/errmsg.txt Text conflict in sql/sp.cc Text conflict in sql/sql_acl.cc Text conflict in sql/sql_base.cc Text conflict in sql/sql_class.h Text conflict in sql/sql_db.cc Text conflict in sql/sql_delete.cc Text conflict in sql/sql_insert.cc Text conflict in sql/sql_lex.cc Text conflict in sql/sql_lex.h Text conflict in sql/sql_load.cc Text conflict in sql/sql_table.cc Text conflict in sql/sql_update.cc Text conflict in sql/sql_view.cc Conflict adding files to storage/innobase. Created directory. Conflict because storage/innobase is not versioned, but has versioned children. Versioned directory. Conflict adding file storage/innobase. Moved existing file to storage/innobase.moved. Conflict adding files to storage/innobase/handler. Created directory. Conflict because storage/innobase/handler is not versioned, but has versioned children. Versioned directory. Contents conflict in storage/innobase/handler/ha_innodb.cc
115 lines
2.8 KiB
Plaintext
115 lines
2.8 KiB
Plaintext
# BUG#33029 5.0 to 5.1 replication fails on dup key when inserting
|
|
# using a trig in SP
|
|
|
|
# For all 5.0 up to 5.0.58 exclusive, and 5.1 up to 5.1.12 exclusive,
|
|
# if one statement in a SP generated AUTO_INCREMENT value by the top
|
|
# statement, all statements after it would be considered generated
|
|
# AUTO_INCREMENT value by the top statement, and a erroneous INSERT_ID
|
|
# value might be associated with these statement, which could cause
|
|
# duplicate entry error and stop the slave.
|
|
|
|
source include/have_binlog_format_statement.inc;
|
|
source include/master-slave.inc;
|
|
|
|
CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
|
|
|
|
--disable_warnings
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
DROP PROCEDURE IF EXISTS p2;
|
|
DROP TRIGGER IF EXISTS tr1;
|
|
DROP FUNCTION IF EXISTS f1;
|
|
--enable_warnings
|
|
|
|
CREATE TABLE t1 (id INT AUTO_INCREMENT PRIMARY KEY);
|
|
CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY);
|
|
|
|
delimiter //;
|
|
|
|
CREATE PROCEDURE p1()
|
|
BEGIN
|
|
DECLARE ins_count INT DEFAULT 10;
|
|
|
|
WHILE ins_count > 0 DO
|
|
INSERT INTO t1 VALUES (NULL);
|
|
SET ins_count = ins_count - 1;
|
|
END WHILE;
|
|
|
|
DELETE FROM t1 WHERE id = 1;
|
|
DELETE FROM t1 WHERE id = 2;
|
|
DELETE FROM t2 WHERE id = 1;
|
|
DELETE FROM t2 WHERE id = 2;
|
|
END//
|
|
|
|
CREATE PROCEDURE p2()
|
|
BEGIN
|
|
INSERT INTO t1 VALUES (NULL);
|
|
DELETE FROM t1 WHERE id = f1(3);
|
|
DELETE FROM t1 WHERE id = f1(4);
|
|
DELETE FROM t2 WHERE id = 3;
|
|
DELETE FROM t2 WHERE id = 4;
|
|
END//
|
|
|
|
CREATE TRIGGER tr1 BEFORE DELETE
|
|
ON t1 FOR EACH ROW
|
|
BEGIN
|
|
INSERT INTO t2 VALUES (NULL);
|
|
END//
|
|
|
|
CREATE FUNCTION f1 (i int) RETURNS int
|
|
BEGIN
|
|
INSERT INTO t2 VALUES (NULL);
|
|
RETURN i;
|
|
END//
|
|
|
|
delimiter ;//
|
|
|
|
# the $binlog_start will be used by the show_binlog_events.inc, so
|
|
# that we can skip binlog events we don't care
|
|
let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
CALL p1();
|
|
source include/show_binlog_events.inc;
|
|
|
|
echo # Result on master;
|
|
SELECT * FROM t1;
|
|
SELECT * FROM t2;
|
|
|
|
sync_slave_with_master;
|
|
|
|
echo # Result on slave;
|
|
SELECT * FROM t1;
|
|
SELECT * FROM t2;
|
|
|
|
connection master;
|
|
|
|
DROP TRIGGER tr1;
|
|
|
|
# the $binlog_start will be used by the show_binlog_events.inc, so
|
|
# that we can skip binlog events we don't care
|
|
let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
|
|
CALL p2();
|
|
source include/show_binlog_events.inc;
|
|
|
|
echo # Result on master;
|
|
SELECT * FROM t1;
|
|
SELECT * FROM t2;
|
|
|
|
sync_slave_with_master;
|
|
|
|
echo # Result on slave;
|
|
SELECT * FROM t1;
|
|
SELECT * FROM t2;
|
|
|
|
# clean up
|
|
connection master;
|
|
disable_warnings;
|
|
DROP TABLE IF EXISTS t1, t2;
|
|
DROP PROCEDURE IF EXISTS p1;
|
|
DROP PROCEDURE IF EXISTS p2;
|
|
DROP FUNCTION IF EXISTS f1;
|
|
DROP TRIGGER IF EXISTS tr1;
|
|
enable_warnings;
|
|
sync_slave_with_master;
|
|
|
|
call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
|