Avoid generating OP_TableLock unnecessary instructions on btrees that

are not sharable.

FossilOrigin-Name: 8cb8516d2009d52d35a22263e4c892f162b34b81

diff --git a/manifest b/manifest
index 2bead908665c4d2dbed2e4aeeca638b2b019578e..27b1efadaa93f0a41e488996a261026251524b39 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sspeedtest1.c\stest\sprogram\sso\sthat\sit\sgives\sclosing\s"%"\swildcards\non\sLIKE\ssearches.
-D 2016-11-08T16:27:59.909
+C Avoid\sgenerating\sOP_TableLock\sunnecessary\sinstructions\son\sbtrees\sthat\s\nare\snot\ssharable.
+D 2016-11-08T17:19:22.006
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -333,7 +333,7 @@ F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 F src/btree.c 6ae1c17347fb2888b2b28a260b947b7717a9fca9
 F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
-F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
+F src/build.c fcd220ccf7cae1b50b700b37eca950cd72c64ff0
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
@@ -1530,7 +1530,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 b5733cae3c519482cf6bc642bd63814afb113d35
-R 8410446de3d24d7eb0c98f660669793b
+P c2f84f637f994c3b4522b48161185a4a2c5bca23
+R 10ce1648dec21a665da138671841929b
 U drh
-Z cf40cde00d3fe62227035d3b07dec2b1
+Z 8856bb137559d0d48b8e63db91d4ed8e

diff --git a/manifest.uuid b/manifest.uuid
index 5e694defb601cb7316d741f38c782ebd14849c86..dcfe87a3ac84cb36f024071f400149adaf97f0e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2f84f637f994c3b4522b48161185a4a2c5bca23
\ No newline at end of file
+8cb8516d2009d52d35a22263e4c892f162b34b81
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 508e747ea6dd93d730359cdada4e4274860b3355..350cf9f713857d8441c863885ee3d990ff6237af 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -59,6 +59,8 @@ void sqlite3TableLock(
   TableLock *p;
   assert( iDb>=0 );
 
+  if( iDb==1 ) return;
+  if( !sqlite3BtreeSharable(pParse->db->aDb[iDb].pBt) ) return;
   for(i=0; i<pToplevel->nTableLock; i++){
     p = &pToplevel->aTableLock[i];
     if( p->iDb==iDb && p->iTab==iTab ){