2 Commits

Author	SHA1	Message	Date
Alfranio Correia	cd4fd3c7c1	merge mysql-5.1 --> mysql-5.5 ... Conflicts: . mysql-test/extra/rpl_tests/rpl_insert_ignore.test . mysql-test/suite/rpl/t/disabled.def . mysql-test/suite/rpl/t/rpl_insert_ignore.test . sql/sql_insert.cc . sql/sql_repl.cc	2011-01-31 13:11:05 +00:00
Alfranio Correia	66abb3d1bb	BUG#59338 Inconsistency in binlog for statements that don't change any rows STATEMENT SBR ... In SBR, if a statement does not fail, it is always written to the binary log, regardless if rows are changed or not. If there is a failure, a statement is only written to the binary log if a non-transactional (.e.g. MyIsam) engine is updated. INSERT ON DUPLICATE KEY UPDATE and INSERT IGNORE were not following the rule above and were not written to the binary log, if then engine was Innodb.	2011-01-28 12:09:15 +00:00