From: drh <drh@noemail.net>
Date: Wed, 23 Jun 2010 15:18:11 +0000 (+0000)
Subject: Fix the xCurrentTimeInt64 interface on windows.  It was off by a factor of 10.
X-Git-Tag: version-3.7.2~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b316cb22dead152c669f577f41f28cbd89776c7f;p=thirdparty%2Fsqlite.git

Fix the xCurrentTimeInt64 interface on windows.  It was off by a factor of 10.

FossilOrigin-Name: 51ef43b9f7db8fabf73d9c8a76dae6c275e50d58
---

diff --git a/manifest b/manifest
index 5bdc71722c..6243eaeeb9 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Simplifications\sto\sthe\spager_delmaster()\simplementation.
-D 2010-06-23T15:04:27
+C Fix\sthe\sxCurrentTimeInt64\sinterface\son\swindows.\s\sIt\swas\soff\sby\sa\sfactor\sof\s10.
+D 2010-06-23T15:18:12
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -158,7 +158,7 @@ F src/os.h d7775504a51e6e0d40315aa427b3e229ff9ff9ca
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 665876d5eec7585226b0a1cf5e18098de2b2da19
 F src/os_unix.c 5231a75a3799872b1250bc70c0e6a1a5960bc865
-F src/os_win.c 73608839342de32280cb378d3c2fc85a5dd80bd2
+F src/os_win.c e5b62352d7a3a2fb486c6b58b56d12feca21951d
 F src/pager.c f16d9f21c4c715ed3d8e6318f50036c93afae224
 F src/pager.h 879fdde5a102d2f21a3135d6f647530b21c2796c
 F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
@@ -828,14 +828,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 2c90276e340aa19d78d2e33c9f759f8eda0b82a3
-R bf609900200a14a42c360ea6940da933
+P 8bfbdec647d29f0eb103ba7deb9116c44193f2e1
+R 09a8767bbb752bc5b889ee5ad34b2188
 U drh
-Z 1f39d78260e4e9f5fdcb6d571e456a29
+Z d3f0906bc523ad7c3782958b2021769c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMIiJ+oxKgR168RlERAmbHAJ99tepdo1EpKH9wYkdaD//e1LgiJwCfZhIU
-qi6cM1OvlcvjNuhNM77GvtA=
-=aMLO
+iD8DBQFMIiW3oxKgR168RlERAv0qAJ0YNJBoEwyIMC3xoABroYp+XV2k5wCcCG9Z
+gBb3bOdo5LzCqETOgEv1j3o=
+=bpAb
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 8f81b129b8..d575526182 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8bfbdec647d29f0eb103ba7deb9116c44193f2e1
\ No newline at end of file
+51ef43b9f7db8fabf73d9c8a76dae6c275e50d58
\ No newline at end of file
diff --git a/src/os_win.c b/src/os_win.c
index 24d0e7ca3f..3803d98223 100644
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -2388,7 +2388,7 @@ static int winCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *piNow){
 
   *piNow = winFiletimeEpoch +
             ((((sqlite3_int64)ft.dwHighDateTime)*max32BitValue) + 
-               (sqlite3_int64)ft.dwLowDateTime)/(sqlite3_int64)1000;
+               (sqlite3_int64)ft.dwLowDateTime)/(sqlite3_int64)10000;
 
 #ifdef SQLITE_TEST
   if( sqlite3_current_time ){