Minor simplification: In OP_ParseSchema, read the p1 register once.

FossilOrigin-Name: bd250533a06e4a11c1f548c3de66b8562fc627383848570d7d030cf132fd336f

diff --git a/manifest b/manifest
index 613ca098a234663e892490e4ac1ee5d1896b8f70..2cec351ab768569c5c7cf0b76c49b517b4b09ef0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\simprovements\sto\sthe\s".help"\scommand\sin\sthe\sCLI.
-D 2018-09-26T18:02:32.772
+C Minor\ssimplification:\sIn\sOP_ParseSchema,\sread\sthe\sp1\sregister\sonce.
+D 2018-09-27T00:04:31.454
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 01e95208a78b57d056131382c493c963518f36da4c42b12a97eb324401b3a334
@@ -573,7 +573,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 36e7d21a20c0bf6ef4ef7c399d192b5239410b7c4d3c1070fba4e30810d0b855
-F src/vdbe.c c7416f6b5e47efbdf09c73a3984ecc68666151ae894c27fb1e51d51bbba62082
+F src/vdbe.c 35844c264d638f2e0ce334c79cf964ce40f9d1609aa5aaf2d62f376de380c938
 F src/vdbe.h 5081dcc497777efe5e9ebe7330d283a044a005e4bdda2e2e984f03bf89a0d907
 F src/vdbeInt.h f1f35f70460698d8f5a2bdef1001114babf318e2983a067804e2ae077d8e9827
 F src/vdbeapi.c 2ba821c5929a2769e4b217dd85843479c718b8989d414723ec8af0616a83d611
@@ -1769,7 +1769,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 209afb8d06466536863b89a8acb9a1a18477a06331d8cce95fc6380e1666b6f5
-R 2bbe28ad2c8e39198abb575c136c791e
-U drh
-Z 46449abd20dff7d89e070088562c2521
+P edc3d18ecbda32d6a55de76ee7335342425c57d917e9b48814a7301a012263b2
+R 2f9baca90efb27d47414a12e20eb21a3
+U mistachkin
+Z 543a7f79652a90c3248b7edf31061012

diff --git a/manifest.uuid b/manifest.uuid
index cd32c03a80378561d695aa5bb9b8b51d3ea13af5..c5f0fd52dfeb6d27f3a8d7540b51233b939c4b18 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-edc3d18ecbda32d6a55de76ee7335342425c57d917e9b48814a7301a012263b2
\ No newline at end of file
+bd250533a06e4a11c1f548c3de66b8562fc627383848570d7d030cf132fd336f
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 6a50fa2f99083cb7b1bbee1d7b5dd2d45deca487..76e27f26032a548b08584a47442a816da0758e06 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5768,7 +5768,7 @@ case OP_ParseSchema: {
   {
     zMaster = MASTER_NAME;
     initData.db = db;
-    initData.iDb = pOp->p1;
+    initData.iDb = iDb;
     initData.pzErrMsg = &p->zErrMsg;
     initData.mInitFlags = 0;
     zSql = sqlite3MPrintf(db,