From: drh <drh@noemail.net>
Date: Tue, 29 May 2012 00:48:55 +0000 (+0000)
Subject: Merge the 64-to-32-bit RTree rounding fixes from trunk into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~233
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c706edac44e16e6ae412e5d78b783fc98e230dca;p=thirdparty%2Fsqlite.git

Merge the 64-to-32-bit RTree rounding fixes from trunk into the sessions branch.

FossilOrigin-Name: 7eff45c28058fd1cb06dfd7f253cf2e4866e8c7c
---

c706edac44e16e6ae412e5d78b783fc98e230dca
diff --cc Makefile.msc
index 83293cf6db,d03e9cfd8b..f0371dbc18
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -519,15 -515,10 +522,17 @@@ TESTSRC2 = 
    $(TOP)\ext\fts3\fts3_aux.c \
    $(TOP)\ext\fts3\fts3_expr.c \
    $(TOP)\ext\fts3\fts3_tokenizer.c \
+   $(TOP)\ext\fts3\fts3_unicode.c \
+   $(TOP)\ext\fts3\fts3_unicode2.c \
    $(TOP)\ext\fts3\fts3_write.c \
 -  $(TOP)\ext\async\sqlite3async.c
 +  $(TOP)\ext\async\sqlite3async.c \
 +  $(TOP)\ext\session\sqlite3session.c
 +
 +# Source code to the library files needed by the test fixture
 +# (amalgamation)
 +#
 +TESTSRC3 = \
 +  $(TOP)\ext\session\sqlite3session.c
  
  # Header files used by all library source files.
  #
diff --cc manifest
index 218406dac3,97ff035bc2..847851c94a
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sthe\sunicode61\stokenizer\sand\sthe\sshared-cache-memory\sdatabase\schanges\ninto\sthe\ssessions\sbranch.
- D 2012-05-28T18:22:41.850
 -C In\sthe\sRTree\smodule,\smake\ssure\sall\sdouble-to-float\sconversions\sround\sin\sa\ndirection\sto\sincrease\sthe\ssize\sof\selement\sbounding\sboxes.
 -D 2012-05-29T00:39:50.223
++C Merge\sthe\s64-to-32-bit\sRTree\srounding\sfixes\sfrom\strunk\sinto\sthe\ssessions\sbranch.
++D 2012-05-29T00:48:55.913
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc efc373edae0f99cb3b04672ccefea8162664d40b
 -F Makefile.msc 0891f992d012d6b2976f86e80a82ae6839fa9ded
++F Makefile.msc bcc41c5232d1355faa59e4bc96d1561f69b5192a
  F Makefile.vxworks 3b7fe7a0571fdadc61363ebc1b23732d2d6363ca
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 3e857b9b826e818eec9411eafe2c3fa22c1dbb8a
@@@ -1017,7 -1004,7 +1017,7 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P d07b7b67d1b3bf65cfe8d96d45a7f1d387bea7ce bcc72d413e8db5fe8b32147ac22d406e2cd6bb60
- R b36c04fadd1ffa2ea62f85f8b70ce2d4
 -P 480158143be1256cbe4dba52ef1a5b96e172b38c f607ad27c1ede27af24dbee10ca867c8f7761ee3
 -R 38bedd0c37f624ccf215394e11ad9336
++P df817e70afc3f41e680d8f84dfa5772d5b3ae4d9 0abdc2903d8b3f86cad426e1bac2a959d1b1f7dd
++R f8bdf16e0b6379c99170e71117fa9c48
  U drh
- Z 8ba551aeea4cedaaff2626e9d4283953
 -Z 4bf39e44bbbf20a271c4dc152544fd6f
++Z a23d222ba42cdc5e20627a5287bd3b9c
diff --cc manifest.uuid
index c13e3c4a04,942005486b..999fb322d3
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- df817e70afc3f41e680d8f84dfa5772d5b3ae4d9
 -0abdc2903d8b3f86cad426e1bac2a959d1b1f7dd
++7eff45c28058fd1cb06dfd7f253cf2e4866e8c7c