Commit 56e143c5 authored by unknown's avatar unknown
Browse files

Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 

into  romeo.(none):/home/bk/b26286-mysql-5.1-rpl
parents a74cdb23 072d62c7

mysql-test/extra/rpl_tests/rpl_insert_delayed.test

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ if ($binlog_format_statement) 
{

  # statement below will be converted to non-delayed INSERT and so

  # will stop at first error, guaranteeing replication.

  --error ER_DUP_ENTRY

  --error ER_DUP_ENTRY_WITH_KEY_NAME

  insert delayed into t1 values(10, "is Bond"), (20, "James Bond");

}

if (!$binlog_format_statement)
@@ -64,7 +64,7 @@ if ($binlog_format_statement) 
  # statement below will be converted to non-delayed INSERT and so

  # will be binlogged with its ER_DUP_ENTRY error code, guaranteeing

  # replication (slave will hit the same error code and so be fine).

  --error ER_DUP_ENTRY

  --error ER_DUP_ENTRY_WITH_KEY_NAME

  insert delayed into t1 values(20, "is Bond"), (10, "James Bond");

}

if (!$binlog_format_statement)