diff --git a/manifest b/manifest
index f5cc249751..f8c32841be 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\ssqlite3BtreeKeySize()\sinterface\sinto\ssqlite3BtreeIntegerKey()\sand\nmake\sit\sonly\swork\sfor\stable\sbtrees.\s\sChange\ssqlite3BtreeDataSize()\sinto\nsqlite3BtreePayloadSize()\sand\smake\sit\swork\sfor\sall\sbtrees.\s\sCombine\nsqlite3BtreeDataFetch()\sand\ssqlite3BtreeKeyFetch()\sinto\sa\ssingle\nsqlite3BtreePayloadFetch()\sroutine.\s\sThese\schanges\sseem\sto\smake\sthe\nb-tree\sinterface\smore\srational\sand\sthey\sreduce\sboth\sbinary\ssize\sand\nCPU\susage.
-D 2016-06-04T20:37:10.186
+C Fix\sa\sC99-ism\sand\sa\scompiler\swarning\sfor\sMSVC.
+D 2016-06-04T20:58:35.587
 F Makefile.in 7321ef0b584224781ec7731408857fa8962c32cc
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 831503fc4e988f571590af1405645fff121b5f1e
@@ -326,7 +326,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c b55e96857e89734ae0ef2e77ed07b5e55314f1d9
+F src/btree.c 579a8160f57db168425ef940276319bed48a95d3
 F src/btree.h 2107a2630e02c8cba58bb12ce14e731e734ea29c
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c e827e57e4a29c00e8429c5fd4d9d4572cb1b32a4
@@ -448,7 +448,7 @@ F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
-F src/vdbe.c f6d37b366fe426637708ad6ad21d93e8b52512e2
+F src/vdbe.c e23a15d352e63b51cf08af8052e678e67c54ec09
 F src/vdbe.h 5591b5add447096e31288b5a0a78ec5d7b5c5170
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c 02bcbc2ca5d2004b029088b05b468b394881e103
@@ -1500,10 +1500,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 b411107a3609d53af4e147f01e311b858b78420b
-R 80a60ad5ffc5ad6e753a2a298aeee05c
-T *branch * btree-refactor
-T *sym-btree-refactor *
-T -sym-trunk *
+P bef35e18dd19732f7859287b097feeb593e5900f
+R 7b13c2762e2abdaed13574cfe801f7ea
 U drh
-Z 4c3d5b0be019f44c3e1bc23daff07019
+Z c33407f01f615b8db559b27222022193
diff --git a/manifest.uuid b/manifest.uuid
index 2fca7ce9d8..0b98334436 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bef35e18dd19732f7859287b097feeb593e5900f
\ No newline at end of file
+aa53a36ea2eb90cc4939e37e6ad320b4211692fd
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 4003352a5e..550beb38aa 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -619,8 +619,9 @@ static int saveCursorKey(BtCursor *pCur){
     pCur->nKey = sqlite3BtreeIntegerKey(pCur);
   }else{
     /* For an index btree, save the complete key content */
+    void *pKey;
     pCur->nKey = sqlite3BtreePayloadSize(pCur);
-    void *pKey = sqlite3Malloc( pCur->nKey );
+    pKey = sqlite3Malloc( pCur->nKey );
     if( pKey ){
       rc = sqlite3BtreeKey(pCur, 0, (int)pCur->nKey, pKey);
       if( rc==SQLITE_OK ){
diff --git a/src/vdbe.c b/src/vdbe.c
index 356cf52f01..245c5beb6c 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4646,7 +4646,7 @@ case OP_RowData: {
 #endif
 
   n = sqlite3BtreePayloadSize(pCrsr);
-  if( n>db->aLimit[SQLITE_LIMIT_LENGTH] ){
+  if( n>(u32)db->aLimit[SQLITE_LIMIT_LENGTH] ){
     goto too_big;
   }
   testcase( n==0 );