From: drh <drh@noemail.net>
Date: Fri, 16 Dec 2016 01:09:22 +0000 (+0000)
Subject: Merge enhancements from trunk, and especially the ability to use
X-Git-Tag: version-3.16.0~36^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c06bbceb9ce2a5b6088a2f837308b7e6823cb4d0;p=thirdparty%2Fsqlite.git

Merge enhancements from trunk, and especially the ability to use
temp.sqlite_master as an alias for sqlite_temp_master.

FossilOrigin-Name: 994a4401f5c34fed17af420761291b03072a5ea1
---

c06bbceb9ce2a5b6088a2f837308b7e6823cb4d0
diff --cc manifest
index 2b64aeeef2,ca47317dff..a7d760429e
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\scost\sestimation\sin\sthe\sBestIndex\smethod\sof\sthe\seponymous\spragma\nvirtual\stable\simplementation.
- D 2016-12-15T21:33:55.724
 -C All\stemp.sqlite_master\sto\sbe\sused\sas\san\salias\sfor\ssqlite_temp_master.
 -D 2016-12-16T01:00:21.326
++C Merge\senhancements\sfrom\strunk,\sand\sespecially\sthe\sability\sto\suse\ntemp.sqlite_master\sas\san\salias\sfor\ssqlite_temp_master.
++D 2016-12-16T01:09:22.413
  F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@@ -334,7 -334,7 +334,7 @@@ F src/btmutex.c bc87dd3b062cc26edfe7991
  F src/btree.c b2055dff0b94e03eaad48a760984a2d8e39244e6
  F src/btree.h 2349a588abcd7e0c04f984e15c5c777b61637583
  F src/btreeInt.h 10c4b77c2fb399580babbcc7cf652ac10dba796e
- F src/build.c 43c9c2bde195267364e92833b36e78f6c5afc66a
 -F src/build.c 854ec3a222d2872df5351339f7af4002e64fdd1a
++F src/build.c ec9e3595d74690af28595cfda996da0fc9dba27f
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
@@@ -464,7 -464,7 +464,7 @@@ F src/vdbeblob.c f4f98ea672b242f807c08c
  F src/vdbemem.c d3fd85b7b7ef3eb75de29c6d7e1d10d3ca78b4fd
  F src/vdbesort.c bb34eed4fb52e11ac037dccea4ee3190594c7f9e
  F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
- F src/vtab.c 24f3412e26511701cda951a32b7b33b693cdf450
 -F src/vtab.c fd64fd37aad1e47e3e887f0e171099ddddc7e3cb
++F src/vtab.c 104907646940e597f60debb42e7e0981b276dcaa
  F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
  F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
  F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
@@@ -1536,7 -1536,7 +1536,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 2c274a1a7b57ef1208901fbc1d96d39c0d492652
- R 443faf38855e36ce9518a22aacd4e206
 -P 4e3749127e7249f46e17bfabc614b0876f60565a
 -R 27200c6ed9ee619c25ffbd7fc5b77433
++P 7126807a186746a8663fbaa267d63214d06476e4 8d646905b830d5bb29092e103ac5cb499b3c7e5a
++R c03b90088a1e080799e09d2f075e1354
  U drh
- Z cec7546529435a8d9c60da5648254c3a
 -Z dbd7760e0bb1a8efbcd514dce9f9a0ad
++Z 3b955bd6345f72aad83fc556ff64eb52
diff --cc manifest.uuid
index 0e05c05ce7,da81604870..4b11bf1ff2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7126807a186746a8663fbaa267d63214d06476e4
 -8d646905b830d5bb29092e103ac5cb499b3c7e5a
++994a4401f5c34fed17af420761291b03072a5ea1