diff options
| author | Alfranio Correia <alfranio.correia@oracle.com> | 2011-01-31 13:11:05 +0000 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@oracle.com> | 2011-01-31 13:11:05 +0000 |
| commit | 318bdb6c666c1ab7876aa4280d76b707bcc4f655 (patch) | |
| tree | 2ecb0add210ec3ca1cdf74929ac371e6897dd61c /mysql-test/r | |
| parent | 29c2d1724d85d7a9b8d22c8f4b628fbedfe3fe42 (diff) | |
| parent | 54c58cea3bdc0733ffe7ba1dd93632ac6b78e403 (diff) | |
| download | mariadb-git-318bdb6c666c1ab7876aa4280d76b707bcc4f655.tar.gz | |
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
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 993d33d7a38..fb1552b6c28 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -519,21 +519,21 @@ SUCCESS # 12. Read-write statement: IODKU, change 0 rows. # insert t1 set a=2 on duplicate key update a=2; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS commit; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS # 13. Read-write statement: INSERT IGNORE, change 0 rows. # insert ignore t1 set a=2; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS commit; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS # 14. Read-write statement: INSERT IGNORE, change 1 row. |