2 commits

Author	SHA1	Message	Date
monty@mysql.com	4e63fb9891	After merge fixes	2004-10-20 17:28:40 +03:00
guilhem@mysql.com	13af58aab6	Fix for BUG#5949 "error code 1223 in binlog when using innobackup": ... when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT, it was accepted but my_error() was called and so, while client got no error, error was logged in binlog. We now don't call my_error() in this case; we assume the connection know what it does. This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.	2004-10-11 11:01:38 +02:00