From: drh <drh@noemail.net>
Date: Tue, 27 Dec 2016 12:45:41 +0000 (+0000)
Subject: Adjust a corruption test case to accommodate the sqlite3BtreeInsert()
X-Git-Tag: version-3.16.0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ad74a761db60d985ee36b5f926f9aa2a056a0aa;p=thirdparty%2Fsqlite.git

Adjust a corruption test case to accommodate the sqlite3BtreeInsert()
optimization of check-in [0b86fbca66].

FossilOrigin-Name: 4cb0945f13f2040c8b67936b950da48fc951d55d
---

diff --git a/manifest b/manifest
index ad20453554..60d41d8a95 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\snew\stest\smodules\snockpt.test\sand\sinterrupt2.test\sfor\sincompatible\npermutations.\s\sAdd\sa\sCORRUPT_DB\sterm\sto\san\sassert()\sin\svdbe.c.
-D 2016-12-27T12:35:36.977
+C Adjust\sa\scorruption\stest\scase\sto\saccommodate\sthe\ssqlite3BtreeInsert()\noptimization\sof\scheck-in\s[0b86fbca66].
+D 2016-12-27T12:45:41.649
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -600,7 +600,7 @@ F test/corrupt8.test 2399dfe40d2c0c63af86706e30f3e6302a8d0516
 F test/corrupt9.test 730a3db08d4ab9aa43392ea30d9c2b4879cbff85
 F test/corruptA.test 53e56dafd180addcdadb402244b8cb9771d2ba26
 F test/corruptB.test 73a8d6c0b9833697ecf16b63e3c5c05c945b5dec
-F test/corruptC.test 0c46574f8d4f27ecc799b1b5c4cbf9b1817bce9a
+F test/corruptC.test 4ef10844eba5213bd262f4d96784d7fcda114afe
 F test/corruptD.test b3c205fac7952b1de645ce44bb02335cd9e3e040
 F test/corruptE.test 82ccf4f8f543fdbedd4aa42c709cb077f7374c62
 F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
@@ -1539,7 +1539,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2d71cbdf6bc24f0269027c70b39ea7f342436bdb
-R 489b2a3e1a6fc86f485ef85f303a7517
+P a54e619e6f0266932c8873f9ac826fd042a0602f
+R eb35cd952180d5ebb2679925e01b66f1
 U drh
-Z 1382d3dd489de9084fb45c97add8c7aa
+Z a0a0f1b4d334e304a9f18235642eec10
diff --git a/manifest.uuid b/manifest.uuid
index 28eb1d9dff..e7e11f6c8e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a54e619e6f0266932c8873f9ac826fd042a0602f
\ No newline at end of file
+4cb0945f13f2040c8b67936b950da48fc951d55d
\ No newline at end of file
diff --git a/test/corruptC.test b/test/corruptC.test
index 80c3c09f61..e2fb1f33c4 100644
--- a/test/corruptC.test
+++ b/test/corruptC.test
@@ -100,6 +100,12 @@ do_test corruptC-2.1 {
 } {1 {database disk image is malformed}}
 
 # test that a corrupt content offset size is handled (seed 5649)
+#
+# Update 2016-12-27:  As of check-in [0b86fbca66] "In sqlite3BtreeInsert() when
+# replacing a re-existing row, try to overwrite the cell directly rather than
+# deallocate and reallocate the cell" on 2016-12-09, this test case no longer
+# detects the offset size problem during the UPDATE.  We have to run a subsequent
+# integrity_check to see it.
 do_test corruptC-2.2 {
   db close
   forcecopy test.bu test.db
@@ -117,8 +123,9 @@ do_test corruptC-2.2 {
   hexio_write test.db 3746 [format %02x 0x9a]
 
   sqlite3 db test.db
-  catchsql {UPDATE t1 SET y=1}
-} {1 {database disk image is malformed}}
+  db eval {UPDATE t1 SET y=1}
+  db eval {PRAGMA integrity_check}
+} {/Offset .* out of range/}
 
 # test that a corrupt free cell size is handled (seed 13329)
 do_test corruptC-2.3 {