Merge the changes for version 3.16.2.

FossilOrigin-Name: c59c8880238dffd7b8a6da789aa7112fef333bd6

diff --cc manifest
index 0e21fb4dcfd544e07619683872d937391fc6be9a,f93933413e65916f4f42bacebd59299a1c583f83..83e4ab857b86d4d9e83d84252e82f0e923c11394
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\schanges\sfrom\sthe\s3.16.1\srelease
- D 2017-01-03T20:20:30.331
 -C Version\s3.16.2
 -D 2017-01-06T16:32:41.471
 -F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
++C Merge\sthe\schanges\sfor\sversion\s3.16.2.
++D 2017-01-06T17:01:53.000
 +F Makefile.in 6107f11b53eb2067c13b84c7c5b88c9a7764728a
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 -F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
 +F Makefile.msc 16477ab34568b4cfd8abac4b5840f3dfc7806aec
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION 571f747f178898e400d90570d3ca7898732170a6
+ F VERSION 5c92800c89751cee56a70d8e1eab9b3c09b1df22
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -353,10 -350,10 +353,10 @@@ F src/hash.c 63d0ee752a3b92d4695b2b1f52
  F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
  F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
- F src/insert.c 91ba5d0143e66479081536ebbaff1850ec9f57d9
+ F src/insert.c 7af46a3be2656f5e13791464625d93d6b07b8612
 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e
 +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21
  F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d
 -F src/main.c e207b81542d13b9f13d61e78ca441f9781f055b0
 +F src/main.c 54068ad4462bb4b44f8308e0dc3d2bfda1f51af3
  F src/malloc.c f3fad34cd570022abca558c573f1761fb09a8212
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -383,21 -380,20 +383,21 @@@ F src/pager.h 366f586bbcb92b797b954d95b
  F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
  F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
 -F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
 -F src/pragma.c 0e7a7c6f1c6fd8ff50c0fff65b8bb80174bc49c5
 +F src/pcache1.c 6d8c7bc6bbae077a0c76440cf32342a65dfeac75
- F src/pragma.c 5924c96852a8f653935ae9c4f287ac26b7dfc1d9
- F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c
++F src/pragma.c 74f24422fcac808e9026dcf7c36c70ff00d67497
+ F src/pragma.h 61aa5389118594bebb28120a6720401aee34ce1a
 -F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a
 +F src/prepare.c 601681ecade57127ffbb5df1e096a30f29eff54c
  F src/printf.c 0c8579432f47948d9be5077eb590e8c4a01be667
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c bb070cf5f23611c44ab7e4788803684e385fc3fb
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c dfb6cadc3dcfba1b1bdbfba62ebba2b4b673413e
+ F src/select.c 4437d9d5d56b6ffdedabf394c7fe3a07ff521ce9
  F src/shell.c 6095531aa900decdaa765e0f3993fba7153c92c1
- F src/sqlite.h.in b716539d1ab93f3027b320f2393f81cc3e0f0bf9
 -F src/sqlite.h.in 29bda4bee01248a5650567d7a22fac39bad1b542
++F src/sqlite.h.in 353a46ff31f2e974b4a67c5d24bc38fe848a3a76
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae
 -F src/sqliteInt.h 2075e22d50833ca2d9956d0b7a6bfb845ad05dd2
 +F src/sqliteInt.h 25ec82510aed8458adfd1efda99c44b66309a22a
  F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247
  F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1
  F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
@@@ -459,13 -455,13 +459,13 @@@ F src/update.c 1da7c462110bffed442a4288
  F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
  F src/util.c 1534060bc034cdc51381c040c8bd6252dbcb64c9
  F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
 -F src/vdbe.c 88bd6c32b333580d2661ac3afe33369757fb1522
 +F src/vdbe.c 5870d9f62f5c0b9fd25d41ca47b92314bf045b5b
- F src/vdbe.h 50ee139f9c68fff91be1d717ed3a6abbd496919c
+ F src/vdbe.h b0866e4191f096f1c987a84b042c3599bdf5423b
  F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 -F src/vdbeapi.c d6ebaa465f070eb1af8ba4e7b34583ece87bdd24
 +F src/vdbeapi.c fe1a1ebda30a22c9a20ebf8cf2d88b2685c01bb8
- F src/vdbeaux.c 12919c5aa354296d6b9ba808bca3e9dda836858c
+ F src/vdbeaux.c 35c9a9908174e5a26c96d15e1f98214814a39147
  F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
- F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
+ F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
  F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
  F src/vtab.c c4bbe0f870f52036553f8098aee0703997f0577a
@@@ -1012,9 -1007,10 +1012,10 @@@ F test/pcache.test 9a04fa260cb47dd4fdc5
  F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
  F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
  F test/permutations.test cd0b7bc04bf5e50d3a993d24c834d591f7d4f5fe
 -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8
 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f
  F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
  F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed
+ F test/pragma4.test 2fcabe7a352888f8aa70aad87eabe6481ea99b04
  F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc
  F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054
  F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb
@@@ -1484,10 -1481,10 +1486,10 @@@ F tool/mkmsvcmin.tcl 2f12f7fa8858bbe61c
  F tool/mkopcodec.tcl d1b6362bd3aa80d5520d4d6f3765badf01f6c43c
  F tool/mkopcodeh.tcl a01d2c1d8a6205b03fc635adf3735b4c523befd3
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl a30ee93515135466fc49ae881f75da07ebcafd19
+ F tool/mkpragmatab.tcl ebb4bfcd2f8010e0a3934b6118db4b5f2f5edf5c
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb
 -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e
 +F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66
  F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@@ -1546,7 -1543,10 +1548,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 4b1e780433fe72611b065962e419965c6644f430 979f04392853b8053817a3eea2fc679947b437fd
- R dd7dacb01d1a57d277a37278ab487925
 -P 01b4cb26762f42064311445f65304388d6fdcfb5
 -R 831df29e5e666fb597bfde5e36d65ee1
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.16.2 *
++P dcbec226ca250fb9711edee41c2fafc883707808 a65a62893ca8319e89e48b8a38cf8a59c69a8209
++R 198c6da3035f8c0dc889b710a32dbfc2
  U drh
- Z 726fb522e356ff65bb471fabced148d1
 -Z 649c8c751fe149918f54c32f14d87f62
++Z f8079d737159cf0fee731ec202cec4ea

diff --cc manifest.uuid
index 80d29ace1a5da194a888e35eb651aed1b5485e99,389afb5c7bf8f0d06a7b994d4370bb3d90881371..5a77cebb47f0fdcb73bf38ea3893ab7bab726ac5
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- dcbec226ca250fb9711edee41c2fafc883707808
 -a65a62893ca8319e89e48b8a38cf8a59c69a8209
++c59c8880238dffd7b8a6da789aa7112fef333bd6

diff --cc src/pragma.c
Simple merge

diff --cc src/sqlite.h.in
Simple merge