diff --git a/manifest b/manifest
index 443be1b2bd..f9b12284f9 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Put\sthe\sSQLITE_UNTESTABLE\scompile-time\soption\sin\sthe\scorrect\sorder\sfor\nPRAGMA\scompile_options.
-D 2016-12-07T17:06:12.360
+C Performance\soptimization\sfor\ssqlite3VdbeAddOp4().
+D 2016-12-07T20:09:51.583
 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -459,7 +459,7 @@ F src/vdbe.c 3986f226945b14b98eb26bd589de3705223c95ad
 F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7
 F src/vdbeInt.h 9b498d3cb52dc2efb53571fb8ae8e14cf298ce84
 F src/vdbeapi.c ea4e2dc2213cc6bd7bee375a29a9b51c31b93ae0
-F src/vdbeaux.c 50a8caa4c8ce8b4c26bad807a6cae89fcc3bdb7e
+F src/vdbeaux.c 3afb187a9239e49d999a0f077f7c138a2799d074
 F src/vdbeblob.c f4f98ea672b242f807c08c92c7faaa79e5091b65
 F src/vdbemem.c 1af2f14ab0f7004b364933ddcfc767fb880d4742
 F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c
@@ -1536,7 +1536,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 f360818737e73ee4f944685a547abc8f14f47819
-R f5ba64c964c5dccab19f910ff0a2ac41
+P 24574a15a336ffcb961334f84b56e9ab98490a79
+R fe9a80abf2b1a7e9a5d7d152eff8a8fe
 U drh
-Z 1f3e5852b0694b4e7c0a8b4adaebbb2a
+Z 7f586b627685f0d65f8b0e7af7753ff2
diff --git a/manifest.uuid b/manifest.uuid
index 01db6f30d3..4c1a459fe2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-24574a15a336ffcb961334f84b56e9ab98490a79
\ No newline at end of file
+04716c907bf9fc9b827e18fdc7b4e1069e201536
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 308d96917f..04dc9599f5 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -313,7 +313,11 @@ int sqlite3VdbeAddOp4Int(
   int p4              /* The P4 operand as an integer */
 ){
   int addr = sqlite3VdbeAddOp3(p, op, p1, p2, p3);
-  sqlite3VdbeChangeP4(p, addr, SQLITE_INT_TO_PTR(p4), P4_INT32);
+  if( p->db->mallocFailed==0 ){
+    VdbeOp *pOp = &p->aOp[addr];
+    pOp->p4type = P4_INT32;
+    pOp->p4.i = p4;
+  }
   return addr;
 }