[sql] Import SQLite 3.17.0.

third_party/sqlite/src/test/conflict2.test

Index: third_party/sqlite/src/test/conflict2.test
diff --git a/third_party/sqlite/src/test/conflict2.test b/third_party/sqlite/src/test/conflict2.test
index 64969138493f5545c9570bef4870be471cadae9b..f33e01d582709fa584d919aa07487e8128a8dfde 100644
--- a/third_party/sqlite/src/test/conflict2.test
+++ b/third_party/sqlite/src/test/conflict2.test
@@ -287,22 +287,25 @@ do_test conflict2-6.0 {
 # Update: Since temporary table files are now opened lazily, and none
 # of the following tests use large quantities of data, t3 is always 0.
 #
+# Update (2016-03-04): Subjournals now only open when their size
+# exceeds 64KB.
+#
 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 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 1
+  1 {}       UPDATE                  1 {6 7 8 9}  1 0 0
+  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
+  5 ABORT    UPDATE                  1 {1 2 3 4}  1 0 0
+  6 ROLLBACK UPDATE                  1 {1 2 3 4}  0 0 0
   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
+  8 IGNORE   {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
   9 FAIL     {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
- 10 ABORT    {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
+ 10 ABORT    {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
  11 ROLLBACK {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
  12 {}       {UPDATE OR IGNORE}      0 {6 7 3 9}  1 0 0
- 13 {}       {UPDATE OR REPLACE}     0 {7 6 9}    1 0 1
+ 13 {}       {UPDATE OR REPLACE}     0 {7 6 9}    1 0 0
  14 {}       {UPDATE OR FAIL}        1 {6 7 3 4}  1 0 0
- 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 1
+ 15 {}       {UPDATE OR ABORT}       1 {1 2 3 4}  1 0 0
  16 {}       {UPDATE OR ROLLBACK}    1 {1 2 3 4}  0 0 0
 } {