From: dan <dan@noemail.net>
Date: Sat, 30 Jul 2016 17:59:39 +0000 (+0000)
Subject: Merge latest trunk with this branch.
X-Git-Tag: version-3.15.0~110^2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb17ce9300e71e89ec48665924a5162686bc1e62;p=thirdparty%2Fsqlite.git

Merge latest trunk with this branch.

FossilOrigin-Name: 63ae02d084a332250ff6fd8d8c80e53bf5422a68
---

cb17ce9300e71e89ec48665924a5162686bc1e62
diff --cc manifest
index c185b508a4,ddf53b746a..fdb83a0054
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Remove\sthe\sEP_Vector\sexpression\sflag.
- D 2016-07-30T16:39:28.446
 -C Using\sthe\sheader\sfile\s'intrin.h'\srequires\sMSVC\s2005\sor\slater.
 -D 2016-07-29T17:36:27.088
++C Merge\slatest\strunk\swith\sthis\sbranch.
++D 2016-07-30T17:59:39.678
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
+ F Makefile.msc 3340e479e5221f06c3d61726f8f7efff885e4233
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cb29eb11e493dd85b3eeec4053c03949bf98478e
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -383,12 -383,12 +383,12 @@@ F src/printf.c a5f0ca08ddede803c241266a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 -F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4
 +F src/select.c 0115f5d222f5cf9b5511ec4072088417354d738a
  F src/shell.c 9351fc6de11e1d908648c0a92d85627138e3dee5
- F src/sqlite.h.in c6e68a4a47610631822a4f8f83a44c9f75339331
+ F src/sqlite.h.in cd10e4206b91c4bf03f121ab9209a14af0b48f14
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
- F src/sqlite3ext.h 46f300b6e300e0fa916d7d58c44b53415b8471a9
- F src/sqliteInt.h 618346a0ad21589a177aeaa3725a6dfe0b2dbcf3
+ F src/sqlite3ext.h f4206565eb5f5cef9a1544d32a076b5f47af1bdc
 -F src/sqliteInt.h d6f221a5bd572df935140beda82f357c2185a77c
++F src/sqliteInt.h ccfffd24330a373a971fee69b6b06a9b7e9ddced
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -463,10 -463,10 +463,10 @@@ F src/vxworks.h d2988f4e5a61a4dfe82c652
  F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
  F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
  F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354
- F src/where.c df58d6ad7878a08aa96c652ccbc6d0949f8fa472
 -F src/where.c fcaa38d19c2a7bb450cc57810bdc3d4eb36e00b0
 -F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0
 -F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41
 -F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563
++F src/where.c 61db3a409b6b89383abd0e746965da424676f8ea
 +F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
 +F src/wherecode.c 6131be0cb19702665c3decbf243dae58ecc15937
 +F src/whereexpr.c 82196ee82ca9de9d133ae742786bb89cf6ee890d
  F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
  F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
  F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@@ -1512,7 -1508,7 +1512,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 42607366bfc2dceb1013797a973b3b8df75dcb4d
- R eaef7077e544c307dde0b934686aad76
 -P 544c990afd3b64064cc4d970ec5d7eb23eeb9914
 -R ceef2b71453325469cbc16ff7674c4c9
 -U mistachkin
 -Z 0275ffb3719041525e752ce514a5292f
++P e9d9c6d46b46160fad6aa6e3441a65a09157515f 9fae75c08b7d3b3e13734193ad8398ef6971cbac
++R 9891078e76bc1592d3c3f0175b7e1e59
 +U dan
- Z c4dca5e01854a7cf15bed46750135eb4
++Z b42ff5e1f9b23663ffe713255f8923fa
diff --cc manifest.uuid
index 1b7e127455,5827550e55..b26f57e106
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e9d9c6d46b46160fad6aa6e3441a65a09157515f
 -9fae75c08b7d3b3e13734193ad8398ef6971cbac
++63ae02d084a332250ff6fd8d8c80e53bf5422a68