Backout the change in [02f6293f27] as it causes MSVC to complain.

FossilOrigin-Name: aaae74d06f4865818465cfdb440258ae8a5b985a

diff --git a/manifest b/manifest
index aa07fecd684b105ab05f445566c97758d44fe1be..257674eec117d1d366a8e1cd89df1a73e68df4a2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sC99-style\svariable\sdeclaration\sissue\sseen\swith\solder\sversions\sof\sMSVC.
-D 2017-02-01T22:59:29.767
+C Backout\sthe\schange\sin\s[02f6293f27]\sas\sit\scauses\sMSVC\sto\scomplain.
+D 2017-02-01T23:03:54.479
 F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@@ -460,7 +460,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 ec059d331da77cb2e3e8af3fb7e40443ed148fbd
+F src/vdbe.c e7b1e860140f1d1803c6f4176b1e8f3801f3a290
 F src/vdbe.h 59998ffd71d7caa8886bc78dafaf8caeccd4c13c
 F src/vdbeInt.h 4e4b15b2e1330e1636e4e01974eab2b0b985092f
 F src/vdbeapi.c 3e4a8893feeb78620f4aac4ac5b85d92255b97e1
@@ -1552,7 +1552,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 6a378c29b43d61313ca9daa599e59d8eeeed9a27
-R 464fa6ae427ab1455a9a5204291b6a50
+P 54d285464a222c59327eb6c917c1cc0125a55a27
+Q -02f6293f278f7b0a0f4876f5c6a0f4dc42620d79
+R c167920e65eb1311d91ae6d6e9361130
 U mistachkin
-Z 85455f002136d0ca47deec93d577c815
+Z 464bc0b25a9ceacfcf91d7e8480e3c64

diff --git a/manifest.uuid b/manifest.uuid
index 93c65ce658f762c94c00bc642a365396099b6688..6df479bdb38ad93b5243b6788c1079c0b28a0ab7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-54d285464a222c59327eb6c917c1cc0125a55a27
\ No newline at end of file
+aaae74d06f4865818465cfdb440258ae8a5b985a
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index c8b3db8cf2be9513d49290ad111d36ba99341efa..cb8a039abbafc01e9aaa6b59f39131d87cafff6a 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -562,7 +562,7 @@ int sqlite3VdbeExec(
   Vdbe *p                    /* The VDBE */
 ){
   Op *aOp = p->aOp;          /* Copy of p->aOp */
-  Op *pOp;                   /* Current operation */
+  Op *pOp = aOp;             /* Current operation */
 #if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
   Op *pOrigOp;               /* Value of pOp at the top of the loop */
 #endif