From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 14 Feb 2006 13:48:33 +0000 (+0000)
Subject: Fix bug in test_async.c version of OsFileSize(). (CVS 3095)
X-Git-Tag: version-3.6.10~3072
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf623f25cdd4db58d1a729b439be1fddc3f16924;p=thirdparty%2Fsqlite.git

Fix bug in test_async.c version of OsFileSize(). (CVS 3095)

FossilOrigin-Name: 239e53b4f29b4faf2dbdc2aebd2332ad25b14286
---

diff --git a/manifest b/manifest
index fc163d0070..7fa3de90f5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssimple\sio\serror\stests\sfor\stest_async.c.\s(CVS\s3094)
-D 2006-02-14T13:25:44
+C Fix\sbug\sin\stest_async.c\sversion\sof\sOsFileSize().\s(CVS\s3095)
+D 2006-02-14T13:48:34
 F Makefile.in 5d8dff443383918b700e495de42ec65bc1c8865b
 F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -80,7 +80,7 @@ F src/test4.c ff4e9406b3d2809966d8f0e82468ac5508be9f56
 F src/test5.c 7162f8526affb771c4ed256826eee7bb9eca265f
 F src/test6.c 60a02961ceb7b3edc25f5dc5c1ac2556622a76de
 F src/test7.c d28d3e62f9594923648fc6a8fb030eba36564ba1
-F src/test_async.c 326fc8dcced899473fca2d877a05e446c1c92fef
+F src/test_async.c 3cdf60bc8c171edb6dcca2280f3856e3222f54c4
 F src/test_md5.c 6c42bc0a3c0b54be34623ff77a0eec32b2fa96e3
 F src/test_server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/tokenize.c 382b3bb0ca26eb9153b5d20b246ef512a114a24f
@@ -106,7 +106,7 @@ F test/alter3.test a6eec8f454be9b6ce73d8d7dc711453675a10ce7
 F test/altermalloc.test 6e1f404ec021eb2ba6582e3c77b0a35cf206b7af
 F test/analyze.test 2f55535aa335785db1a2f97d3f3831c16c09f8b0
 F test/async.test ae59f861f17f3e9076cd557cd93677b7c77e57b5
-F test/async2.test 941fe5e7f44c3ab85fd62cfd615a20980d2ab717
+F test/async2.test 48ad3250cd8c330bbc453677050f2479b1cd6f5b
 F test/attach.test 036315207c477211470168bf121b1c493f781515
 F test/attach2.test 0e6a7c54343c85dd877a1e86073a05176043ed40
 F test/attach3.test 63013383adc4380af69779f34f4af19bd49f7cbe
@@ -353,7 +353,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P f4150c29df2774b4422d4296d913cdbcee62c859
-R aae805bd9f65608fc6774fd635877e1c
+P 528dfb71801bb7b8a66944db6f32cc3dc0054118
+R a1b635f09d2d56322ff3f05d56d57b87
 U danielk1977
-Z 364385439507478c54b1444a42b19b2e
+Z ddae2f240109eb3d55973c2c0f0a9799
diff --git a/manifest.uuid b/manifest.uuid
index fbe63b5790..07fff89933 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-528dfb71801bb7b8a66944db6f32cc3dc0054118
\ No newline at end of file
+239e53b4f29b4faf2dbdc2aebd2332ad25b14286
\ No newline at end of file
diff --git a/src/test_async.c b/src/test_async.c
index 422a0007bd..897f20e33f 100644
--- a/src/test_async.c
+++ b/src/test_async.c
@@ -364,8 +364,8 @@ static void addAsyncWrite(AsyncWrite *pWrite){
     async.pQueueFirst = pWrite;
   }
   async.pQueueLast = pWrite;
-  TRACE(("PUSH %p (%s %s)\n", pWrite, azOpcodeName[pWrite->op],
-         pWrite->pFile ? pWrite->pFile->zName : "-"));
+  TRACE(("PUSH %p (%s %s %d)\n", pWrite, azOpcodeName[pWrite->op],
+         pWrite->pFile ? pWrite->pFile->zName : "-", pWrite->iOffset));
 
   if( pWrite->op==ASYNC_CLOSE ){
     async.nFile--;
@@ -604,7 +604,7 @@ int asyncFileSize(OsFile *id, i64 *pSize){
             s = MAX(p->iOffset + (i64)(p->nByte), s);
             break;
           case ASYNC_TRUNCATE:
-            s = MIN(s, p->nByte);
+            s = MIN(s, p->iOffset);
             break;
         }
       }
diff --git a/test/async2.test b/test/async2.test
index d08fb66812..1962fa9bd8 100644
--- a/test/async2.test
+++ b/test/async2.test
@@ -5,7 +5,7 @@
 #
 #***********************************************************************
 #
-# $Id: async2.test,v 1.1 2006/02/14 13:25:45 danielk1977 Exp $
+# $Id: async2.test,v 1.2 2006/02/14 13:48:34 danielk1977 Exp $
 
 
 if {[info commands sqlite3async_enable]==""} {
@@ -59,7 +59,6 @@ for {set n 3} {$::go} {incr n} {
   sqlite3async_start
   sqlite3async_wait
 
-  sqlite3async_enable 0
   set ::sqlite_io_error_pending 0
   sqlite3 db test.db
   set c [db eval {SELECT c FROM counter LIMIT 1}]