Ensure that "main" can always be used to refer to the main database, even if it has...

FossilOrigin-Name: 682b426f5658254e63dff02c960b557fb33cb3e944fdd14faa0aa9988af7269a

diff --cc manifest
index b1fe28f76286c947ecf50f7d4a76ce3726df4133,ea53eae3b10fe09d37d2523ee93cc88ad236b111..622cd4770f90ef87eb3d9a2c503f7470941ec7e2
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Change\sa\sbitfield\sin\ssqlite3_stmt\sinto\san\sunsigned\scharacter,\sfor\sslightly\nsmaller\scode\sand\sbetter\sperformance.
- D 2020-03-21T15:07:27.669
 -C Consolidate\ssome\scode\son\sthis\sbranch.
 -D 2020-03-21T15:10:40.677
++C Ensure\sthat\s"main"\scan\salways\sbe\sused\sto\srefer\sto\sthe\smain\sdatabase,\seven\sif\sit\shas\sbeen\srenamed\susing\sSQLITE_DBCONFIG_MAINDBNAME.
++D 2020-03-21T15:41:55.795
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -529,14 -529,14 +529,14 @@@ F src/pragma.h 9473160d220416456b40f273
  F src/prepare.c 8d4d6c8aa6afefc48027c54b41cdf134b4d6bc2fc4badbe483ad7fd9e1728a28
  F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
- F src/resolve.c 38e3a5636f5bdc92e3683e4cafbba6418c0aa15e0d89ca5b28bd0b621dbb80bf
+ F src/resolve.c 0529815271886204fe0eb4b03a662434664f214a5d904408bda5a3c75c3683d2
  F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 -F src/select.c 49d46acea0e69311aa891e18253973d63e81da2a9c135924bc827856d33872ad
 +F src/select.c cb7588bfe9e1a900801e5ca345296b32b85ded0d57b2f277a9962294eb4c7aa2
  F src/shell.c.in f76590931c0cbbfef347f44f81ade6b335f80c46bc6e59b8b6114383a8df30e0
  F src/sqlite.h.in 802957feeb249ede54f8dfe99b72aa19e70a0b7737969c46e625dc2f9f2d42b0
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 9c5269260409eb3275324ccace6a13a96f4ad330c708415f70ca6097901ff4ee
- F src/sqliteInt.h 3ccd2aedc57f61009285c4fa7ca1d75b380a48b5168f9605c10c86a7be62156c
 -F src/sqliteInt.h 493893267f7559c5d2efa78a9ed09a6ead39414a5391198fa79320deed005221
++F src/sqliteInt.h 3e15c159d5f2348e705e0c841c795b4a7f1ec14d129bd79d7c5bc228fa4d57fd
  F src/sqliteLimit.h 95cb8479ca459496d9c1c6a9f76b38aee12203a56ce1092fe13e50ae2454c032
  F src/status.c 9ff2210207c6c3b4d9631a8241a7d45ab1b26a0e9c84cb07a9b5ce2de9a3b278
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -1860,7 -1860,7 +1860,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P aa92f9b95f95d40cc58910da87168a5bd440f71deb072dc651bb15936315786c
- R b1a402197c3dd747d332863aba643c9a
- U drh
- Z 5b9ced2a7dd596cf0ffa6b2f623acefa
 -P 75c85ca32f9ae4a28fd8f8ff2f7639599413d22af706e9799a0e76cc560d14eb
 -R 9f200a38f3d5dd609cc0e96ac8da06d4
++P 0d4d3c642494ad494b4ec937215eaf833158e62e5ae59ed981d6b546220c13b8 a85c63daa640e02fdfd891a05a1a09e848c9621a5dd6e112338451008623ecbb
++R 5b8a0ae99cc89cbebf501a334996a4cc
++T +closed a85c63daa640e02fdfd891a05a1a09e848c9621a5dd6e112338451008623ecbb
+ U dan
 -Z 42bb12140840c55bbaec3b428d0e044c
++Z 8b468ce05910eb5b50c49ff125dc587c

diff --cc manifest.uuid
index f5f6e18a512aa11aacae37a7a01ea9d6ba5106dd,dbae9bf1882d097777b33cadaec224bc6caf43ba..9aa5fe8e4b32fb0fb4d3627c64344f8e68d0fd40
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0d4d3c642494ad494b4ec937215eaf833158e62e5ae59ed981d6b546220c13b8
 -a85c63daa640e02fdfd891a05a1a09e848c9621a5dd6e112338451008623ecbb
++682b426f5658254e63dff02c960b557fb33cb3e944fdd14faa0aa9988af7269a

diff --cc src/sqliteInt.h
Simple merge