Fix an error message.

FossilOrigin-Name: a70fdaa3903835dca338d68e750716fd3ab9dedbdfb2be6d6e058fd5fcb415fa

diff --git a/manifest b/manifest
index cf767258898bc1bf8ba4612a8885e7ef157ff660..608d516bd2d2b65ec39a28c93599df398852555a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2019-03-20T16:03:02.054
+C Fix\san\serror\smessage.
+D 2019-03-20T19:17:45.194
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -461,7 +461,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 9bcd70009cac284622ef6816daca22fda99b4fb54ce0027b461dea52bcb299fa
 F src/btree.h 63b94fb38ce571c15eb6a3661815561b501d23d5948b2d1e951fbd7a2d04e8d3
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
-F src/build.c f556ca5fe2c6a2a8c78bc7303a772f1d86979738cbdec112fbddca3f5505143a
+F src/build.c ace0fcc6e91f76670bebcbb9c0bc0a68d36180df35655b9ad6c70b5f6e920f99
 F src/callback.c 0d68a032872495351f70d533610a94388a4f191cce37ec7663d6598eaa8a4a21
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c 109e58d00f62e8e71ee1eb5944ac18b90171c928ab2e082e058056e1137cc20b
@@ -1697,7 +1697,7 @@ F test/window6.test 5eae4ae7a590ccf1e605880969ca0bad3955616ac91cad3031baea38748b
 F test/windowfault.test 12ceb6bbb355d13e8fcd88c5731a57256dfdf77b9a7ae20842a76fcd4623df5b
 F test/with1.test a07b5aad7f77acdf13e52e8814ea94606fcc72e9ea4c99baf293e9d7c63940be
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
-F test/with3.test e6b1730a4a8044a198363706d0228b20266d56333650ddffa3f088a3332d1ea4
+F test/with3.test 8d26920c88283e0a473ceebd3451554922108ce7b2a6a1157c47eb0a7011212c
 F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f198205
 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64
 F test/without_rowid1.test 533add9100255e4cc430d371b3ecfb79f11f956b86c3a1b9d34413bf8e482d8f
@@ -1815,7 +1815,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 97a9604d85cf5044e8109e533d4682b25bfe6a110f403ebd0fdef03880059f37 f0f02d46e40667d0fc31c57eb26d459ce2f3a3c222c767fa371100b36e5335d1
-R 9e634e6e7aa4a351cbb067ba7310f572
+P 4cd20ca6776ef1c2f041fe6d30f84a3cf5f8a634eb34db2dce3217ee781d5848
+R 1959c03193910b46d4cc186035c9c055
 U dan
-Z 5648d16c5beee34b02bc9de30c4c0265
+Z 3b3101b4ff11c36fa58a1721256f163a

diff --git a/manifest.uuid b/manifest.uuid
index 475db5eaeb623509e1ece8c4c67428eeb9d8b097..c65bafa08b43ed2a83fef52caeef431c7995909b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4cd20ca6776ef1c2f041fe6d30f84a3cf5f8a634eb34db2dce3217ee781d5848
\ No newline at end of file
+a70fdaa3903835dca338d68e750716fd3ab9dedbdfb2be6d6e058fd5fcb415fa
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 907b34c86a6701e0c369ef720eeea5c04853bb9d..5f937eefa670287e92621c9dd3ae09c98732cfa1 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -431,7 +431,7 @@ Table *sqlite3LocateTable(
     p = 0;
   }
 
-  if( p==0 && pParse->nErr==0 ){
+  if( p==0 && (!IsReuseSchema(db) || pParse->nErr==0) ){
     const char *zMsg = flags & LOCATE_VIEW ? "no such view" : "no such table";
     if( zDbase ){
       sqlite3ErrorMsg(pParse, "%s: %s.%s", zMsg, zDbase, zName);

diff --git a/test/with3.test b/test/with3.test
index 47eba2d1a4e1f3478528d73dbcec6375ed376786..0f49f0685903b49854a1ba44c5c21d530f0d0e9a 100644 (file)
--- a/test/with3.test
+++ b/test/with3.test
@@ -30,7 +30,7 @@ do_catchsql_test 1.0 {
     SELECT 5 FROM t0 UNION SELECT 8 FROM m
   )
   SELECT * FROM i;
-} {1 {no such table: t0}}
+} {1 {no such table: m}}
 
 # Additional test cases that came out of the work to
 # fix for Kostya's problem.