Merge in all the trunk changes that have occurred since this branch was

opened.

FossilOrigin-Name: 6d507e4de924e2f4556ea4a03ee0fa7d647bf8bb

diff --cc manifest
index 054bc8cc9ae052c389be15a52d3e117adc096f7b,e9e164b948135d673b6aff805e2ec247bd094b5a..940b592a46a4ba0fd2b628a8670b7501f043e58e
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,12 -1,12 +1,12 @@@
- C Fix\sthe\svirtual\stable\sIN\soptimizer\sso\sthat\sit\swork\seven\sif\sthe\svirtual\stable\nimplementation\sleaves\sthe\ssqlite3_index_info.aConstraintUsage[].omit\sflag\nclear\sfor\san\sequality\sconstraint\sthat\sit\sintends\sto\suse.
- D 2012-12-14T15:36:17.947
 -C Generalize\sthe\smin/max\soptimization\sso\sthat\sif\san\sappropriate\sindex\sexists,\nthe\sindex\sit\scan\sbe\sused\sby\sany\saggregate\squery\sthat\scontains\sonly\sa\ssingle\nmax()\sor\smin()\sand\sdoes\snot\scontain\sa\sGROUP\sBY\sclause.
 -D 2012-12-13T18:57:31.980
++C Merge\sin\sall\sthe\strunk\schanges\sthat\shave\soccurred\ssince\sthis\sbranch\swas\nopened.
++D 2012-12-14T15:54:05.684
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
+ F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 1d8a5d3cf33b8b8d3247c99367a37af384cc7ebd
+ F Makefile.msc 5a3b6f34d263b01f8b798c291fac1529fd650308
  F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION edab4af5a4623f8198833ea481ce98ab53750a8d
+ F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@@ -249,10 -250,10 +250,10 @@@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb
  F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2
  F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6
  F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b
- F src/where.c 87c95ca9005909af852a3a1b62451a43cf76fb6a
 -F src/where.c 53b991af50dab230b319b098bcb90fc7cd82da47
++F src/where.c 6bcd38a2bc9a2d2ed8dc9b622625efb8c53e8911
  F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
- F test/aggnested.test 0be144b453e0622a085fae8665c32f5676708e00
+ F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
  F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
  F test/all.test 52fc8dee494092031a556911d404ca30a749a30b
  F test/alter.test 57d96ec9b320bd07af77567034488dcb6642c748
@@@ -916,7 -918,7 +918,7 @@@ F test/vacuum4.test d3f8ecff345f1669115
  F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
  F test/veryquick.test 7701bb609fe8bf6535514e8b849a309e8f00573b
  F test/view.test b182a67ec43f490b156b5a710827a341be83dd17
- F test/vtab1.test 524beb672c42463fe3d37351b74253c0b835498d
 -F test/vtab1.test 36c9935e4be3b6350b31b6b697561b6fc3ab349a
++F test/vtab1.test 4403f987860ebddef1ce2de6db7216421035339d
  F test/vtab2.test 7bcffc050da5c68f4f312e49e443063e2d391c0d
  F test/vtab3.test baad99fd27217f5d6db10660522e0b7192446de1
  F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275
@@@ -1020,8 -1024,8 +1024,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
- P aa650746b19e4a6a373f7e47effff3ab2f48e78c
- R 53d6793b7f79df12237947dc6769b11d
+ F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
 -P 8bcf5f51d8a6ea47ba4eb8de001d7a30e0a5f2c3 7280e14cd8f55896451847b432171e8750a07c81
 -R dd1fb1ab301b504c23fc61d7da06adfc
++P d6e045f89c5a4b500b1da7ea1224b132909bafc6 52e755943f87354febe214e5dc3b423a1e38ba80
++R 31359f190d617098d7e9f461bfe956e6
  U drh
- Z b558501f7c6a3f6651858b319af65966
 -Z c76dfaa5ec5d18c5fce102d2fd745bf3
++Z 9b9491b018acf588c19d70e23c3069cb

diff --cc manifest.uuid
index 22bae2629b2d0602d5e582cd2d8b67696ac3c037,af816cef7325d23b7efdc46906f346bc30825613..f44adeed60c8ab3b25e2ce754a0c0f579d6b9793
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d6e045f89c5a4b500b1da7ea1224b132909bafc6
 -52e755943f87354febe214e5dc3b423a1e38ba80
++6d507e4de924e2f4556ea4a03ee0fa7d647bf8bb

diff --cc src/where.c
Simple merge

diff --cc test/vtab1.test
Simple merge