Simplifications to blobSeekToRow().

FossilOrigin-Name: 495ea824093ff535734c22c3115384c08f855c02

diff --git a/manifest b/manifest
index 3c10f176f07a3824458cb4a35625b68b2f3872bc..fa96e1cee39b93cb9745846f4b801aa3771c032a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sC99-style\scomment.\s\sFixes\sto\sthe\skvtest-speed.sh\sscript.
-D 2017-01-31T16:49:01.913
+C Simplifications\sto\sblobSeekToRow().
+D 2017-01-31T19:02:15.083
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -463,7 +463,7 @@ F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
 F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
 F src/vdbeaux.c 6847b02aa2db536ed15d90f1fdc2923afef93c5b
-F src/vdbeblob.c 2b3d1ad915dbe5dc92c48759dc18fa8c697e78e5
+F src/vdbeblob.c 359891617358deefc85bef7bcf787fa6b77facb9
 F src/vdbemem.c 3b5a9a5b375458d3e12a50ae1aaa41eeec2175fd
 F src/vdbesort.c eda25cb2d1727efca6f7862fea32b8aa33c0face
 F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834
@@ -1549,7 +1549,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 2361b03b61311aab9b9ec9de040bbb73be31be0d
-R 085c25b2bd73ed43799df664becffebf
+P 91eb6b628e278d20eccc647293e5b30765163e12
+R 793d15c782afd1bb1c67c16147a858a7
 U drh
-Z 9d1629688efb4c919cbb0184aee51efa
+Z 0d3326b5592bbe49f8801dfaea3a7026

diff --git a/manifest.uuid b/manifest.uuid
index 80341cb011f7a1808f753c0824a7ebfa7689ad28..fb73fe6210af8e4c2b0af04196ad3e6688b1f6d1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-91eb6b628e278d20eccc647293e5b30765163e12
\ No newline at end of file
+495ea824093ff535734c22c3115384c08f855c02
\ No newline at end of file

diff --git a/src/vdbeblob.c b/src/vdbeblob.c
index 810f78860f1f8004386deb85538a737e5be7fa88..5692c1c606d77001ac7f62be5788ef23352b9671 100644 (file)
--- a/src/vdbeblob.c
+++ b/src/vdbeblob.c
@@ -55,7 +55,6 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
   int rc;                         /* Error code */
   char *zErr = 0;                 /* Error message */
   Vdbe *v = (Vdbe *)p->pStmt;
-  sqlite3 *db = v->db;
 
   /* Set the value of register r[1] in the SQL statement to integer iRow. 
   ** This is done directly as a performance optimization
@@ -69,9 +68,7 @@ static int blobSeekToRow(Incrblob *p, sqlite3_int64 iRow, char **pzErr){
   ** counter is faster. */
   if( v->pc>3 ){
     v->pc = 3;
-    db->nVdbeExec++;
-    rc = sqlite3VdbeExec((Vdbe*)p->pStmt);
-    db->nVdbeExec--;
+    rc = sqlite3VdbeExec(v);
   }else{
     rc = sqlite3_step(p->pStmt);
   }