Merge fixes from trunk.

FossilOrigin-Name: f9060b2a9860b09ea0e268f6c135a2c78bc8d12d

diff --cc manifest
index 4bb252f0909352603b5bed3b346116a39e2fd0e6,58eb701cc2a6f3673c638af4e0ed8fb81279b373..eb743a9a73fccfc9f83984e39bfb3de5658b4f1a
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,6 -1,6 +1,6 @@@
- C Import\sthe\stest_sqllog.c\senhancements\sfrom\strunk.
- D 2015-11-12T21:55:02.967
 -C Change\sthe\serror\smessages\sso\sthat\sthey\sbegin\scan\sbe\sgrepped\susing\s'^!'\sinstead\nof\s'^\s'.\s\sThere\sare\sfar\stoo\smany\sextraneous\soutputs\sthat\sbeing\swith\sa\sspace.
 -D 2015-11-13T00:03:14.576
 -F Makefile.in d828db6afa6c1fa060d01e33e4674408df1942a1
++C Merge\sfixes\sfrom\strunk.
++D 2015-11-13T02:13:18.484
 +F Makefile.in eebca73951f1f5827925d997e634daef95fdd364
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc e928e68168df69b353300ac87c10105206653a03
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@@ -305,9 -302,9 +305,9 @@@ F src/hash.h c8f3c31722cf3277d037139097
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
  F src/insert.c 419a947f27ce2da18eebf440a5aa80cc825defae
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59
  F src/loadext.c 18586e45a215325f15096821e9c082035d4fb810
- F src/main.c df7430d3b3834582aaf5968f674fe7b0eab70356
 -F src/main.c 91feb5c7e393ad8f0c434754114a3493c3b0617a
++F src/main.c 5d8883e245ff3c7a24529e964d807a942a8fd16a
  F src/malloc.c 337bbe9c7d436ef9b7d06b5dd10bbfc8f3025972
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
@@@ -335,20 -332,19 +335,20 @@@ F src/parse.y aad5cc866dc23719f361fe7e0
  F src/pcache.c 73895411fa6b7bd6f0091212feabbe833b358d23
  F src/pcache.h 1ff11adce609ba7de139b6abfabaf9a2bac947b5
  F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
- F src/pragma.c 44e32568b4b24e6f1c7a5df87029a0ee6d0a3b34
- F src/pragma.h 31b110aaecb5603829c97747b99abfe491df5fa0
 -F src/pragma.c f3e7147299ca05ef4304a36f1fd6e002729c72c6
++F src/pragma.c c1ab37e1576d22715d3bae4f51658326240a8161
+ F src/pragma.h 3d94aebbebd2089899fecc01909bf2608b39507d
 -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb
  F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
  F src/select.c 00a2a10d4298a685d0eeb05b09ef018a2bd81bf8
  F src/shell.c acefb4593a9bf0338a757c968f1f1bb05690d830
 -F src/sqlite.h.in fa62718f73553f06b2f2e362fd09ccb4e1cbb626
 +F src/sqlite.h.in df28d4fdd2c6c902ed68bb4d0223e370f97c7d74
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h 40ca51b677d493a528ea026a927ac59378c0f819
 -F src/sqliteInt.h 1b8c1b37f0bd2cec784c9f257e449f72096b37f8
++F src/sqliteInt.h 649e4e7d7a618d91c91ade829fa9086604f4683d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1062,10 -1057,10 +1062,10 @@@ F test/table.test b708f3e5fa2542fa51dfa
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
  F test/tclsqlite.test 7fb866443c7deceed22b63948ccd6f76b52ad054
 -F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 +F test/tempdb.test 3263e5c3f0604e54d307481e8587327c54544d18
  F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
  F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1
- F test/tester.tcl 348d0226e44124ebedec2bc70218943fb3ba3567
 -F test/tester.tcl 9df86ab273a0877ffb4ec26c255166dcdca4c278
++F test/tester.tcl 9d9de709de13446fcc9019c6aafffcbbca2c4c71
  F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
  F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
  F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@@ -1370,10 -1365,10 +1370,10 @@@ F tool/mkkeywordhash.c 37f9c2e62c31384b
  F tool/mkopcodec.tcl edde8adc42621b5e598127f8cdc6d52cfe21f52b
  F tool/mkopcodeh.tcl e04177031532b7aa9379ded50e820231ac4abd6e
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
- F tool/mkpragmatab.tcl 473b6a156bc018d36aac5288d8479a879d570b93
+ F tool/mkpragmatab.tcl e94e55d247d4fe3be34f2a4f4edb03fdcd09ce5b
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
  F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
@@@ -1408,7 -1403,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 e72331c719375dcfcfaba160f00d26e5460e9230 9d532fb50d310df629ea65193f21dc9b3594ff5f
- R bbf3e08bf84f489af422fcab0ba25e4f
 -P ee6f2feec7d777a969ddba6dc00fb571d64e57f8
 -R 408d324b4f8f857ba19128e8367a34ed
++P 178da33909ff8e524cdefeede40fa5bd908efb37 367ec0db49607559960d58891771113c205fd951
++R 69354fa6b1fb4f06cbfa41c37eca9b34
  U drh
- Z 40ac7216e76c05963ea1ffb0b84595bb
 -Z 9a6642a6fe3dd67383802a321d24cffd
++Z f6978513e5067fdbee9e868f875096ce

diff --cc manifest.uuid
index 40cddd590e8ebfc8885023b7f0b54a6c941a053b,ca4e35f2cfdc3da0740de1a0430e32e74c1dd911..20ed36ecb7d5e3e25f9bf43c332b4c521b02a5ed
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 178da33909ff8e524cdefeede40fa5bd908efb37
 -367ec0db49607559960d58891771113c205fd951
++f9060b2a9860b09ea0e268f6c135a2c78bc8d12d

diff --cc src/main.c
Simple merge

diff --cc src/pragma.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc test/tester.tcl
Simple merge