mariadb

Tree: f18a10c6c1

Commit Graph

Author	SHA1	Message	Date
unknown	f6834c02ca	Fix for BUG#25507 "multi-row insert delayed + auto increment causes duplicate key entries on slave" (two concurrrent connections doing multi-row INSERT DELAYED to insert into an auto_increment column, caused replication slave to stop with "duplicate key error" (and binlog was wrong)), and BUG#26116 "If multi-row INSERT DELAYED has errors, statement-based binlogging breaks" (the binlog was not accounting for all rows inserted, or slave could stop). The fix is that: if (statement-based) binlogging is on, a multi-row INSERT DELAYED is silently converted to a non-delayed INSERT. Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap), so it is tested only in the changeset for 5.1. However, BUG#26116 is tested here, and the fix for BUG#25507 is the same code change. mysql-test/r/innodb-replace.result: result update mysql-test/t/innodb-replace.test: now that multi-row delayed inserts are converted to normal inserts if the statement-based binlog is enabled, no error is issued even if this engine does not support INSERT DELAYED, as the insert does not go through the INSERT DELAYED code. To preserve the goal of this test, we change the statements to single- row inserts. sql/sql_insert.cc: A multi-row INSERT DELAYED cannot be recorded to a statement-based binlog in a way that describes the insertions actually done; in that case we fallback to a non-delayed INSERT. mysql-test/r/rpl_insert_delayed.result: result. Master and slave match. mysql-test/t/rpl_insert_delayed.test: Test for BUG#26116 (see if one error at first row on master makes the slave's data incorrect, see if one error at second row on master makes slave stop).	19 years ago
unknown	57fa327069	Small fixes done while reviewing pushed code mysql-test/r/innodb-replace.result: Added proper cleanup for test mysql-test/t/innodb-replace.test: Added proper cleanup for test sql/share/english/errmsg.txt: Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters	21 years ago
unknown	baf121de4f	Clean up InnoDB testing with embedded server. BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a: Delete: mysql-test/r/innodb.result.es mysql-test/mysql-test-run.sh: Remove innodb tests from list of tests automatically skipped with embedded server mysql-test/r/innodb.result: Update results mysql-test/t/innodb-deadlock.test: Skip with embedded server mysql-test/t/innodb-lock.test: Skip with embedded server mysql-test/t/innodb.test: Move test of replace delayed to new test file, add to --replace_result to clean up path	21 years ago

Author

SHA1

Message

Date

unknown

f6834c02ca

Fix for BUG#25507 "multi-row insert delayed + auto increment causes

duplicate key entries on slave" (two concurrrent connections doing
multi-row INSERT DELAYED to insert into an auto_increment column,
caused replication slave to stop with "duplicate key error" (and
binlog was wrong)), and BUG#26116 "If multi-row INSERT
DELAYED has errors, statement-based binlogging breaks" (the binlog
was not accounting for all rows inserted, or slave could stop).
The fix is that: if (statement-based) binlogging is on, a multi-row
INSERT DELAYED is silently converted to a non-delayed INSERT.
Note: it is not possible to test BUG#25507 in 5.0 (requires mysqlslap),
so it is tested only in the changeset for 5.1. However, BUG#26116
is tested here, and the fix for BUG#25507 is the same code change.


mysql-test/r/innodb-replace.result:
  result update
mysql-test/t/innodb-replace.test:
  now that multi-row delayed inserts are converted to normal inserts
  if the statement-based binlog is enabled,
  no error is issued even if this engine does not support INSERT DELAYED,
  as the insert does not go through the INSERT DELAYED code.
  To preserve the goal of this test, we change the statements to single-
  row inserts.
sql/sql_insert.cc:
  A multi-row INSERT DELAYED cannot be recorded to a statement-based
  binlog in a way that describes the insertions actually done;
  in that case we fallback to a non-delayed INSERT.
mysql-test/r/rpl_insert_delayed.result:
  result. Master and slave match.
mysql-test/t/rpl_insert_delayed.test:
  Test for BUG#26116 (see if one error at first row on master makes the
  slave's data incorrect, see if one error at second row on master
  makes slave stop).

19 years ago

unknown

57fa327069

Small fixes done while reviewing pushed code

mysql-test/r/innodb-replace.result:
  Added proper cleanup for test
mysql-test/t/innodb-replace.test:
  Added proper cleanup for test
sql/share/english/errmsg.txt:
  Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters

21 years ago

unknown

baf121de4f

Clean up InnoDB testing with embedded server.

BitKeeper/deleted/.del-innodb.result.es~ba2a97747fd41a3a:
  Delete: mysql-test/r/innodb.result.es
mysql-test/mysql-test-run.sh:
  Remove innodb tests from list of tests automatically skipped
  with embedded server
mysql-test/r/innodb.result:
  Update results
mysql-test/t/innodb-deadlock.test:
  Skip with embedded server
mysql-test/t/innodb-lock.test:
  Skip with embedded server
mysql-test/t/innodb.test:
  Move test of replace delayed to new test file, add to --replace_result
  to clean up path

21 years ago

3 Commits (f18a10c6c1ced93a83ead017aa10398fa17c9a63)