Remove a C99-style comment. Fixes to the kvtest-speed.sh script.

FossilOrigin-Name: 91eb6b628e278d20eccc647293e5b30765163e12

diff --git a/manifest b/manifest
index 763bbd12a7fa19c470cd1db5291e0a004c7f2e14..3c10f176f07a3824458cb4a35625b68b2f3872bc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sanother\sunnecessary\slocal\svariable\sinitialization\sfrom\ssqlite3VdbeExec()
-D 2017-01-31T16:43:36.486
+C Remove\sa\sC99-style\scomment.\s\sFixes\sto\sthe\skvtest-speed.sh\sscript.
+D 2017-01-31T16:49:01.913
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -458,7 +458,7 @@ F src/update.c 456d4a4656f8a03c2abc88a51b19172197400e58
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c a88b0466fddf445ce752226d4698ca3faada620a
 F src/vacuum.c 33c174b28886b2faf26e503b5a49a1c01a9b1c16
-F src/vdbe.c c0e9bd3fc0f1909e76930e88860ec66edc201d62
+F src/vdbe.c d3765f4d8f667b8d10232b2a1d0498497f3ac09f
 F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
 F src/vdbeInt.h 281cb70332dc8b593b8c7afe776f3a2ba7d4255e
 F src/vdbeapi.c 7a65f10684982daecfce50f557f2632b7f20b198
@@ -1475,7 +1475,7 @@ F tool/fuzzershell.c dbf6c26eef936ec78cb0707570de3a4308b2507e
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
 F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
-F tool/kvtest-speed.sh d6c7c2b5787f44c3be2ed01c8463223032ee598b
+F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
 F tool/lemon.c 5ccba178a8e8a4b21e1c9232944d23973da38ad7
 F tool/lempar.c db1bdb4821f2d8fbd76e577cf3ab18642c8d08d1
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
@@ -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 02f6293f278f7b0a0f4876f5c6a0f4dc42620d79
-R f0488c71d9bf7cc95008ff5cdb6232cc
+P 2361b03b61311aab9b9ec9de040bbb73be31be0d
+R 085c25b2bd73ed43799df664becffebf
 U drh
-Z 567d0d39f344217652f484cd397a1b36
+Z 9d1629688efb4c919cbb0184aee51efa

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

diff --git a/src/vdbe.c b/src/vdbe.c
index b133c7ec85ac9cff1c0eb6e4f2c59e24f68f4337..049c8243f657cfe96f7dc2c37f682908f8bba550 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -597,7 +597,6 @@ int sqlite3VdbeExec(
   }
   assert( p->rc==SQLITE_OK || (p->rc&0xff)==SQLITE_BUSY );
   assert( p->bIsReader || p->readOnly!=0 );
-//  p->rc = SQLITE_OK;
   p->iCurrentTime = 0;
   assert( p->explain==0 );
   p->pResultSet = 0;

diff --git a/tool/kvtest-speed.sh b/tool/kvtest-speed.sh
index 8dc852bef5927531296ae63d85c25c6d92b5d862..5f2c8345bee5caf152649a6fa04cd128ea4cd9ff 100644 (file)
--- a/tool/kvtest-speed.sh
+++ b/tool/kvtest-speed.sh
@@ -21,11 +21,10 @@ gcc -g -Os -I. $OPTS $* kvtest.c sqlite3.c -o kvtest
 # First run using SQL
 rm cachegrind.out.[1-9][0-9]*
 valgrind --tool=cachegrind ./kvtest run kvtest.db $KVARGS 2>&1 | tee summary-kvtest-$NAME.txt
-mv cachegrind.out.[1-9][0-9]* cachegrind.out.$NAME
-cg_anno.tcl cachegrind.out.$NAME >cout-kvtest-sql-$NAME.txt
+mv cachegrind.out.[1-9][0-9]* cachegrind.out.sql-$NAME
+cg_anno.tcl cachegrind.out.sql-$NAME >cout-kvtest-sql-$NAME.txt
 
 # Second run using the sqlite3_blob object
-rm cachegrind.out.[1-9][0-9]*
 valgrind --tool=cachegrind ./kvtest run kvtest.db $KVARGS --blob-api 2>&1 | tee -a summary-kvtest-$NAME.txt
 mv cachegrind.out.[1-9][0-9]* cachegrind.out.$NAME
 cg_anno.tcl cachegrind.out.$NAME >cout-kvtest-$NAME.txt