Merge version 3.35.4 with this branch.

FossilOrigin-Name: e69f29892e5226957578b06e9f7966a8e820fc72c0a8b0a83773fb168caa500f

diff --git a/manifest b/manifest
index 0a365197c2968d07ba70dca1af40b4681632f616..566934bffebf2b8e58da05560fa9da30ed3b5eb7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sin\schanges\sfor\s3.35.3
-D 2021-03-26T13:16:06.758
+C Merge\sversion\s3.35.4\swith\sthis\sbranch.
+D 2021-04-07T15:13:47.077
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -610,7 +610,7 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 8cf83b4b95d09c949e2e4d8f99c0f4bcd955436ef28164f4d4b5f334edaca176
 F src/treeview.c c6260e1fa5f41c361b2409edc9b0050bcaef5bc4d6abc467fbc45f0d7ccf3d84
-F src/trigger.c dae7932e9dfb335986948e63bea5488d768d81e3d279c46d930ab65c0a500db1
+F src/trigger.c ba829071464b07ab763e5226353637aa9b0235ca77aea744825479dceaca728e
 F src/update.c 0f5a61f0787199983530a33f6fffe4f52742f35fcdf6ccfad1078b1a8bc17723
 F src/upsert.c df8f1727d62b5987c4fd302cd4d7c0c84ae57cd65683c5a34a740dfe24039235
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
@@ -1920,7 +1920,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 18bec0d263bd79ca94b5c9e196434e587fbce246178d329d4243ced0ad25ba10 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c
-R 4acabd63ad463ace99a2fd0c44e3f535
-U drh
-Z dfd186b64f334a606da2f04deb19bf17
+P 76f19f4bcfc0228df669c89e0676845e98bbfe161d77b4573d6db513b751a8ca
+R 698e1d2b44db999fc94a657fc45939d2
+U dan
+Z 88361c60553e914251bdac4fd8bdc973

diff --git a/manifest.uuid b/manifest.uuid
index 8bcb2025f847e09798b80ee506b6152303347536..d65ed01d58c20d0518da5aa97f89e06aa2de6795 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-76f19f4bcfc0228df669c89e0676845e98bbfe161d77b4573d6db513b751a8ca
\ No newline at end of file
+e69f29892e5226957578b06e9f7966a8e820fc72c0a8b0a83773fb168caa500f
\ No newline at end of file

diff --git a/src/trigger.c b/src/trigger.c
index b884872364e100453c2c0a62a18cfa3b1957547b..4d6f359f6549ae3e07a00d045a46a920c16a00d9 100644 (file)
--- a/src/trigger.c
+++ b/src/trigger.c
@@ -1093,7 +1093,9 @@ static TriggerPrg *codeRowTrigger(
   Parse *pSubParse;           /* Parse context for sub-vdbe */
   int iEndTrigger = 0;        /* Label to jump to if WHEN is false */
 
-  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) );
+  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger)
+       || IsSharedSchema(pParse->db)
+  );
   assert( pTop->pVdbe );
 
   /* Allocate the TriggerPrg and SubProgram objects. To ensure that they
@@ -1201,7 +1203,9 @@ static TriggerPrg *getRowTrigger(
   Parse *pRoot = sqlite3ParseToplevel(pParse);
   TriggerPrg *pPrg;
 
-  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) );
+  assert( pTrigger->zName==0 || pTab==tableOfTrigger(pTrigger) 
+       || IsSharedSchema(pParse->db)
+  );
 
   /* It may be that this trigger has already been coded (or is in the
   ** process of being coded). If this is the case, then an entry with