From: dan <dan@noemail.net>
Date: Wed, 9 Dec 2015 08:13:55 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0a6803d4f96297dd4a495061547d1565746588c;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: dc236f11181e235ddfe58a7943a462686679bf94
---

f0a6803d4f96297dd4a495061547d1565746588c
diff --cc manifest
index b7d4ed887d,4be65dcffd..631538862f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Experimental\soptimization\sfor\sDELETE\sstatements\swith\sWHERE\sclauses\sthat\squalify\sfor\sthe\sOR-optimization.
- D 2015-12-08T19:50:52.435
 -C Changes\sto\savoid\sundefined\sbehavior\sin\smemset()\sand\smemcpy()\sand\sin\sthe\ncomparisons\sof\spointers\sfrom\sdifferent\sallocations.\s\sAll\sproblems\sare\sfound\nby\sanalysis\stools\s-\snone\shave\sbeen\sseen\sin\sthe\swild.
 -D 2015-12-08T16:58:45.426
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2015-12-09T08:13:55.067
  F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e8fdca1cb89a1b58b5f4d3a130ea9a3d28cb314d
@@@ -291,8 -291,8 +291,8 @@@ F src/complete.c addcd8160b081131005d5b
  F src/ctime.c 60e135af364d777a9ab41c97e5e89cd224da6198
  F src/date.c fb1c99172017dcc8e237339132c91a21a0788584
  F src/dbstat.c ffd63fc8ba7541476ced189b95e95d7f2bc63f78
 -F src/delete.c 00af9f08a15ddc5cba5962d3d3e5bf2d67b2e7da
 +F src/delete.c 97d9d98151a9668e4e3e2b49b09b4af78d756031
- F src/expr.c cb1a419508e5b27769a91e00e36e94724e7b1d51
+ F src/expr.c ccb93d7b7e1ac5d187c9b153bae145933f93ee5c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 31900763094a3736a5fc887469202eb579fef2d0
  F src/func.c fe50a9ab977acc0bb0fcd46741e0071fa388888e
@@@ -344,7 -344,7 +344,7 @@@ F src/shell.c abbc74ea43dbf2f306ea18282
  F src/sqlite.h.in 1248a78548024bdc8ef5893faa0ff9552b4cceb4
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h dfbe62ffd95b99afe2140d8c35b180d11924072d
- F src/sqliteInt.h 8014a4a02831a10a77717be0f63cda56b2ca3883
 -F src/sqliteInt.h 5caacf37a776f9d6178e519cb0b5248ca22a3828
++F src/sqliteInt.h e638ac9057713c6654eb34398faddf2a885668ef
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1408,10 -1408,7 +1408,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P a9e819082ba19e72db03bba37edfb7702ff489a5
- R 6cf318895b737d01fcea67a968880787
- T *branch * onepass-delete-or
- T *sym-onepass-delete-or *
- T -sym-trunk *
 -P f20396adb2cff12a17a3fc90b36241ae3fdfd62a
 -R 70bc46af51bec4fcd5f5ac34f7fbc9eb
 -U drh
 -Z 9b6f69f2c38f1825e156d39e6c72b0a2
++P d52376df53f8d17c6f6e7ca8cc8da2a24f257a7f 901d0b8f3b72e96ffa8e9436993a12980f5ebd51
++R 832f18ec9c40efc445a0eb414e96d686
 +U dan
- Z 99461ed23b9ae573287349e17aa3866d
++Z 50ae4a90ed221c2b42ce0b4ffd54920e
diff --cc manifest.uuid
index 343abb225e,a26e28b825..f036b4341b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d52376df53f8d17c6f6e7ca8cc8da2a24f257a7f
 -901d0b8f3b72e96ffa8e9436993a12980f5ebd51
++dc236f11181e235ddfe58a7943a462686679bf94