| Index: third_party/sqlite/sqlite-src-3100200/test/conflict2.test
|
| diff --git a/third_party/sqlite/src/test/conflict2.test b/third_party/sqlite/sqlite-src-3100200/test/conflict2.test
|
| similarity index 99%
|
| copy from third_party/sqlite/src/test/conflict2.test
|
| copy to third_party/sqlite/sqlite-src-3100200/test/conflict2.test
|
| index 8419f1a3ff3f7a65e8100ae94859e0518d805108..64969138493f5545c9570bef4870be471cadae9b 100644
|
| --- a/third_party/sqlite/src/test/conflict2.test
|
| +++ b/third_party/sqlite/sqlite-src-3100200/test/conflict2.test
|
| @@ -289,11 +289,11 @@ do_test conflict2-6.0 {
|
| #
|
| foreach {i conf1 cmd t0 t1 t2 t3 t4} {
|
| 1 {} UPDATE 1 {6 7 8 9} 1 0 1
|
| - 2 REPLACE UPDATE 0 {7 6 9} 1 0 0
|
| - 3 IGNORE UPDATE 0 {6 7 3 9} 1 0 0
|
| - 4 FAIL UPDATE 1 {6 7 3 4} 1 0 0
|
| + 2 REPLACE UPDATE 0 {7 6 9} 1 0 1
|
| + 3 IGNORE UPDATE 0 {6 7 3 9} 1 0 1
|
| + 4 FAIL UPDATE 1 {6 7 3 4} 1 0 1
|
| 5 ABORT UPDATE 1 {1 2 3 4} 1 0 1
|
| - 6 ROLLBACK UPDATE 1 {1 2 3 4} 0 0 0
|
| + 6 ROLLBACK UPDATE 1 {1 2 3 4} 0 0 1
|
| 7 REPLACE {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 0
|
| 8 IGNORE {UPDATE OR REPLACE} 0 {7 6 9} 1 0 1
|
| 9 FAIL {UPDATE OR IGNORE} 0 {6 7 3 9} 1 0 0
|
|
|