From: dan <dan@noemail.net>
Date: Tue, 29 Apr 2014 16:46:24 +0000 (+0000)
Subject: Merge trunk changes into this branch.
X-Git-Tag: version-3.8.5~65^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4618fb30dbf627ffe92f035fd9303be60033abc;p=thirdparty%2Fsqlite.git

Merge trunk changes into this branch.

FossilOrigin-Name: d74299f037f3a6a4b3bce8b4d1c76c407c1f3b3e
---

e4618fb30dbf627ffe92f035fd9303be60033abc
diff --cc manifest
index cf16f91a6e,41c2bd4ae0..5dc1bf6a38
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Ignore\slikelihood()\svalues\son\sindexed\sIPK\slookups.
- D 2014-04-29T16:10:22.104
 -C Add\sthe\ssqlite3_rtree_query_callback()\sAPI\sto\sthe\sRTree\svirtual\stable.\n(Cherrypick\sfrom\sthe\ssessions\sbranch.)
 -D 2014-04-28T17:56:19.891
++C Merge\strunk\schanges\sinto\sthis\sbranch.
++D 2014-04-29T16:46:24.176
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -291,8 -292,8 +292,8 @@@ F src/vtab.c 21b932841e51ebd7d075e2d0ad
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
  F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
  F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
- F src/where.c 397bd5d4f402238c396d73b3c98b9fa2c312eea4
 -F src/where.c 6ae02f1e8b1b29744d9e8cd9b95eac4c5232736d
 -F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
++F src/where.c 9651faf05f900d9235bf3166fa54a9e5f12a40f2
 +F src/whereInt.h 6804c2e5010378568c2bb1350477537755296a46
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
  F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@@ -723,8 -723,9 +724,9 @@@ F test/orderby1.test 9b524aff9147288da4
  F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
  F test/orderby3.test 8619d06a3debdcd80a27c0fdea5c40b468854b99
  F test/orderby4.test 4d39bfbaaa3ae64d026ca2ff166353d2edca4ba4
 -F test/orderby5.test 2490183fef54417209d1df253633a605d46bd350
 +F test/orderby5.test 8f08a54836d21fb7c70245360751aedd1c2286fb
  F test/orderby6.test 8b38138ab0972588240b3fca0985d2e400432859
+ F test/orderby7.test 3d1383d52ade5b9eb3a173b3147fdd296f0202da
  F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
  F test/pager1.test 1acbdb14c5952a72dd43129cabdbf69aaa3ed1fa
  F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
@@@ -1162,7 -1165,8 +1166,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 2dc5a0b55567f13f0528ed17242e680cde2f2a29
- R b5feca3cdcf90dbcdc4d81625fcb13e8
 -P f5a263658187250044afc1a74000e6f6962733ca
 -Q +3dca2809352c6c6d56db74447a814f77011c6220
 -R 70a04a84bf76743284b12f147604df6e
 -U drh
 -Z 8441eee0dd2b010346629b18a46aad71
++P 5bb7757a7b32a74482d3e93e9c9eea02273fe981 af2cbe64adab5f9e3b0f3da00d06428088589d7f
++R 9c74729ef8e10b97c890b0be6d308bd3
 +U dan
- Z d7294cbb283905147264033ecb5a94d9
++Z e5760c6e9001de9044df542c0c7c165c
diff --cc manifest.uuid
index 0097b17163,fbb0a3e2f9..e9d3392789
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5bb7757a7b32a74482d3e93e9c9eea02273fe981
 -af2cbe64adab5f9e3b0f3da00d06428088589d7f
++d74299f037f3a6a4b3bce8b4d1c76c407c1f3b3e