From: drh <drh@noemail.net>
Date: Mon, 3 May 2010 18:22:52 +0000 (+0000)
Subject: Fix a bug in the xCurrentTime() method of the os_unix.c VFS.
X-Git-Tag: version-3.7.2~447
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0dcb0a7d7bdd5ac0bbd0fde684a2d7c4c3ad906f;p=thirdparty%2Fsqlite.git

Fix a bug in the xCurrentTime() method of the os_unix.c VFS.

FossilOrigin-Name: 551df11a5613e3edc6c5de44f0ac6abc2d0e6cdf
---

diff --git a/manifest b/manifest
index b67e68881c..e3b4bf39be 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\sa\stest\sto\ssimulate\san\sOOM\sduring\slog\srecovery\sto\swalfault.test.
-D 2010-05-03T18:01:22
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\sa\sbug\sin\sthe\sxCurrentTime()\smethod\sof\sthe\sos_unix.c\sVFS.
+D 2010-05-03T18:22:53
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -150,7 +153,7 @@ F src/os.c aec6922553585a25d5655666defc125a7e217674
 F src/os.h b389844e5469a2918e8a45fe6ae52b4c28dfb2b2
 F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
-F src/os_unix.c 2d19037594cd2ae30e6ad77cb4f1cc5a20e4a7df
+F src/os_unix.c 7ab8d2fe59954dca619af3e1bbd4789f5032fece
 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
 F src/pager.c e9c7fe979b32a3c5bf4216d8fbe1cf8beff8a1b8
 F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
@@ -809,7 +812,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P a35551a5305b5160b0eb511da7f8e6fb351ef271
-R 196202511a2c780c88fa3597907d5285
-U dan
-Z 63af9feaaec4bfa813085abfe4d8e201
+P 7ed85e87dd206083310ba28afab4389885f61dac
+R 5175e74c66fe957d15866ec25a37a50d
+U drh
+Z 4c12b5cd19d1cf1c4b00a44c7ab023bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFL3xSAoxKgR168RlERAk5NAJ9h19oeeZO4MhhXCfAtgzetnJJ0ogCeOHLB
+kqaxDmXroX+ZHOZd5wAc6lI=
+=i9YY
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 96da1b67e4..c7289ee3a3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ed85e87dd206083310ba28afab4389885f61dac
\ No newline at end of file
+551df11a5613e3edc6c5de44f0ac6abc2d0e6cdf
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index 1b3223b524..b9e093b59a 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4557,7 +4557,7 @@ static int unixCurrentTimeInt64(sqlite3_vfs *NotUsed, sqlite3_int64 *piNow){
 static int unixCurrentTime(sqlite3_vfs *NotUsed, double *prNow){
   sqlite3_int64 i;
   unixCurrentTimeInt64(0, &i);
-  *prNow = i*86400000.0;
+  *prNow = i/86400000.0;
   return 0;
 }