• marko's avatar
    Merge a change from MySQL AB: · 07bc6522
    marko authored
    ChangeSet
      2007/02/15 15:39:03+01:00 guilhem@gbichot3.local 
      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
      2007/02/15 15:39:01+01:00 guilhem@gbichot3.local +2 -2
      result update
    
    mysql-test/t/innodb-replace.test
      2007/02/15 15:39:01+01:00 guilhem@gbichot3.local +2 -2
      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.
    07bc6522
innodb-replace.result 467 Bytes