From: mistachkin <mistachkin@noemail.net>
Date: Fri, 19 Dec 2014 22:20:27 +0000 (+0000)
Subject: Merge updates from trunk.
X-Git-Tag: version-3.8.8~17^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=129a752bad3f2091dfcf21959011cf0fba4359dd;p=thirdparty%2Fsqlite.git

Merge updates from trunk.

FossilOrigin-Name: 555fb71f6c479936446c2ce75b1b120a9a121f49
---

129a752bad3f2091dfcf21959011cf0fba4359dd
diff --cc manifest
index e8f180d89f,940c131970..d40b8f04c6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sa\scomment.
- D 2014-12-11T04:49:46.125
 -C Simplify\sthe\simplementation\sof\sthe\s"header-value"\spragmas\s(schema_version,\nuser_version,\sfreelist_count,\sand\sapplication_id)\sby\smaking\sthem\smore\ntable-driven.
 -D 2014-12-19T18:49:55.326
++C Merge\supdates\sfrom\strunk.
++D 2014-12-19T22:20:27.435
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -229,11 -229,11 +229,11 @@@ F src/random.c ba2679f80ec82c4190062d75
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c f377fb8a5c73c10678ea74f3400f7913943e3d75
 -F src/shell.c 45d9c9bd7cde07845af957f2d849933b990773cf
 +F src/shell.c 1b7cb3efc5ae6fe82e36407508c4a6b00d8edde1
- F src/sqlite.h.in 2e699aabd1df6042aff4265cd93bdc8812629f11
+ F src/sqlite.h.in 116dc731361549ee3fc79dcebace11b57d24dcfd
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h 28049b803b74a7f73242a8226915ea00ebb1309f
+ F src/sqliteInt.h d36da9a07130cae13cbfee0986bf20028cb01465
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c f142bba7903e93ca8d113a5b8877a108ad1a27dc
@@@ -1227,7 -1233,7 +1233,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P d48eda16ef8a84a93de9c6f38f794aceb4a6ba0d
- R 1034d99337e2b1563f22219c78cd5011
 -P 8c5dd6cc259e0cdaaddaa52ccfa96fee6b166906
 -R 8ba8633e296b4b7fe64ae8b30f249024
 -U drh
 -Z d788c0d876adfa7410350841952e3917
++P e0e102a0bd9d07bccdb1feb95767cb81fb57c29f da27a09d1d991583b59997f6cc67efa28ffd9d6a
++R 094886d67316bc30bdd2407fd2517021
 +U mistachkin
- Z 59252e2fe2e00ed3f4f3196b070ae546
++Z 63a739b2e08da80235a17753f68d1832
diff --cc manifest.uuid
index 45d7bc2004,e0e3164dca..a06f967d2f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e0e102a0bd9d07bccdb1feb95767cb81fb57c29f
 -da27a09d1d991583b59997f6cc67efa28ffd9d6a
++555fb71f6c479936446c2ce75b1b120a9a121f49