Simplification of the sqlite3FaultSim() call inside of

sqlite3PagerCommitPhaseOne().

FossilOrigin-Name: 1b0f4cc362cda1dc175aa363ae4e612b7d1164c3

diff --git a/manifest b/manifest
index 8176f2e8900c27bf9f9d3e86ed5f15579a700fe4..f574e48e65dcc118bced4464bc067789e2d40e56 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\san\sassert\sin\spager.c\sto\sconfirm\sthat\spPager->tempFile\sis\salways\strue\nfor\sin-memory\sdatabases.
-D 2016-05-12T18:38:45.335
+C Simplification\sof\sthe\ssqlite3FaultSim()\scall\sinside\sof\nsqlite3PagerCommitPhaseOne().
+D 2016-05-12T19:05:35.053
 F Makefile.in 9eda6e1c90d05c199c3ec8a7069b0682ad307657
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc db82b35aef27f412fef14d8534afc022138bcdfd
@@ -364,7 +364,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
-F src/pager.c 9089b6f318c96d973f0f26ce866452f514c71120
+F src/pager.c b6b3f2aff301cb025b23a8586666c91355cb3c69
 F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
 F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 F src/pcache.c 3ef140add88d8d3eee3a80a79412f450bd216d3b
@@ -1488,7 +1488,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 9d55b8f541de43deb82d460d32005fd62f5430b2
-R 3abb8b47feac8b594036edc1e8dce6ec
+P 3fd71092063bf1d30e03cf2497ea9c57b3ec82eb
+R 86cdc8fab77fed5ebeb6f9ac3a200e04
 U drh
-Z 8914057de4b6310e97cb7f42ae3b951d
+Z 30e0270ee86eb0dad7cf2e94ccef570b

diff --git a/manifest.uuid b/manifest.uuid
index f608f87e2f78bc2121183bf8d852d0e4a9a480b4..f5d7ecb7b3a683d58d90ae85c79cf33cf464d3d2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3fd71092063bf1d30e03cf2497ea9c57b3ec82eb
\ No newline at end of file
+1b0f4cc362cda1dc175aa363ae4e612b7d1164c3
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 70fccca15845ecffaa8ad22c6c1db026f0303e72..d8ea37122e0e8090ea4eef19d1ddae802dab7eaf 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -6196,7 +6196,7 @@ int sqlite3PagerCommitPhaseOne(
   if( NEVER(pPager->errCode) ) return pPager->errCode;
 
   /* Provide the ability to easily simulate an I/O error during testing */
-  if( (rc = sqlite3FaultSim(400))!=SQLITE_OK ) return rc;
+  if( sqlite3FaultSim(400) ) return SQLITE_IOERR;
 
   PAGERTRACE(("DATABASE SYNC: File=%s zMaster=%s nSize=%d\n", 
       pPager->zFilename, zMaster, pPager->dbSize));