From: dan <dan@noemail.net>
Date: Thu, 3 Jun 2010 19:10:08 +0000 (+0000)
Subject: Fix another problem in test_vfs.c.
X-Git-Tag: version-3.7.2~304
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d03f523d3b765e458561d95f635753248219b307;p=thirdparty%2Fsqlite.git

Fix another problem in test_vfs.c.

FossilOrigin-Name: df7d59899ceb2743764b0433cb68f4bc33f16344
---

diff --git a/manifest b/manifest
index 341b907663..1f70a29a67 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Have\stest_vfs.c\ssimulate\sIO\serrors\sin\sxShmLock.
-D 2010-06-03T18:20:20
+C Fix\sanother\sproblem\sin\stest_vfs.c.
+D 2010-06-03T19:10:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -207,7 +207,7 @@ F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
 F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
 F src/test_thread.c aa9919c885a1fe53eafc73492f0898ee6c0a0726
-F src/test_vfs.c dd2134246d06baa1c8577468d99ea0e82fff0f84
+F src/test_vfs.c 0f0242f29584537845cf0e0dfc04ece0b357b857
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 25ceb0f0a746ea1d0f9553787f3f0a56853cfaeb
 F src/trigger.c 8927588cb9e6d47f933b53bfe74200fbb504100d
@@ -817,7 +817,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ed7774de04978803e979580240148eba1de9166d
-R d0d2a13b20b83bfc33527d4cfc64e20d
+P fcbf7cf189506e43fc2f0820aedffb195038d3a9
+R e093d2af0534cd33e5ed13655be56b08
 U dan
-Z 864d76f976dcce27bb2708f49a43c609
+Z e9eec85577950a5d26e2b23744407a2d
diff --git a/manifest.uuid b/manifest.uuid
index 3d5f7d607f..43d840249c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fcbf7cf189506e43fc2f0820aedffb195038d3a9
\ No newline at end of file
+df7d59899ceb2743764b0433cb68f4bc33f16344
\ No newline at end of file
diff --git a/src/test_vfs.c b/src/test_vfs.c
index 27b43045d6..1beeef47c8 100644
--- a/src/test_vfs.c
+++ b/src/test_vfs.c
@@ -603,10 +603,9 @@ static int tvfsShmGet(
   if( rc==SQLITE_OK && p->mask&TESTVFS_SHMGET_MASK && tvfsInjectIoerr(p) ){
     rc = SQLITE_IOERR;
   }
-  if( rc==SQLITE_OK ){
-    tvfsGrowBuffer(pFd, reqMapSize, pMapSize);
-    *pp = pFd->pShm->a;
-  }
+
+  *pMapSize = pFd->pShm->n;
+  *pp = pFd->pShm->a;
   return rc;
 }