From: drh <drh@noemail.net>
Date: Thu, 21 Jun 2012 15:22:04 +0000 (+0000)
Subject: Merge changes to trunk that ensure that floating point values are exactly
X-Git-Tag: version-3.7.14~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=567520226aac5bef285e488cdd19f321ea415ccf;p=thirdparty%2Fsqlite.git

Merge changes to trunk that ensure that floating point values are exactly
preserved on a round-trip through ".dump".

FossilOrigin-Name: 4cebd60704f92bb3689c126f46feadc3516d3d45
---

567520226aac5bef285e488cdd19f321ea415ccf
diff --cc manifest
index 9bfbdfbfa5,de8e9b1ae0..2c6de2eea8
--- a/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sspelling\stypo.
- D 2012-06-21T15:12:30.926
 -C Disable\sthe\satof1.test\smodule\swhen\scompiling\son\sMSVC.
 -D 2012-06-21T15:02:26.644
++C Merge\schanges\sto\strunk\sthat\sensure\sthat\sfloating\spoint\svalues\sare\sexactly\npreserved\son\sa\sround-trip\sthrough\s".dump".
++D 2012-06-21T15:22:04.664
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in d17fddaa4e81f93a7c9c7c0808aacb3fc95f79f4
 +F Makefile.in 8f6d858bf3df9978ba43df19985146a1173025e4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fd86027849a59a2f621b791b79eabf3f8ffbd684
 -F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
 +F Makefile.msc 0100213e86c66ed5ac37ea98446406c06f012203
 +F Makefile.vxworks 879f034a64062a364b21000266bbd5bc6e0c19b9
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 -F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
 +F VERSION a71848df48082f1d6585d4b0819d530fc455485d
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -500,8 -502,8 +500,8 @@@ F test/fts4langid.test 24a6e41063b416bb
  F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
  F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
  F test/fts4merge3.test aab02a09f50fe6baaddc2e159c3eabc116d45fc7
 -F test/fts4unicode.test 247e6c64563b5f930aec0f89a5b01ed6b4b129cd
 +F test/fts4unicode.test aad033abdcfa0f87ce5f56468f59fdf2a0acbcef
- F test/func.test 9809b7622d721904a8cc33c1ffb87f46d506ed01
+ F test/func.test 0d89043dab9a8853358d14c68e028ee0093bf066
  F test/func2.test 772d66227e4e6684b86053302e2d74a2500e1e0f
  F test/func3.test 001021e5b88bd02a3b365a5c5fd8f6f49d39744a
  F test/fuzz-oss1.test 4912e528ec9cf2f42134456933659d371c9e0d74
@@@ -1004,7 -1006,7 +1004,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P eebd594d6bd09c77727620a818d7dc0b091f55b4
- R be7f54310076aeaf2e41fd02ae207bae
- U mistachkin
- Z 44f889ecf2b83e0a51162901a7e23f5e
 -P d45f7a013f05fe7603d5e6d02df0e6bab2c7ffd8
 -R e35884badae6d1997ef669d538c5ea6c
++P 6131a0002fea5d6f3b416a63a466bf2b69d1e12d 0f706acfc7181f2714a06b2c232677ebeede3a44
++R 24446b639b8f30cdeaec2dbb61cdf6f2
+ U drh
 -Z 9a69b4050bef2b4e8b68607c50525e88
++Z b1dc391973e1c634a2e4e6388b5cc239
diff --cc manifest.uuid
index 18af6b4a3f,4a21353a92..2091a4931f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 6131a0002fea5d6f3b416a63a466bf2b69d1e12d
 -0f706acfc7181f2714a06b2c232677ebeede3a44
++4cebd60704f92bb3689c126f46feadc3516d3d45