Undo change to 'analyze9.test' because the extra output can be useful for debugging.

FossilOrigin-Name: f3081e59091646f97a5208bf47f138f6d55ecf5198b6d060df892e53b12ed510

manifest

@@ -1,5 +1,5 @@
-C Small\sperformance\sand\ssize\soptimization\sin\ssqlite3WalFindFrame().
-D 2019-04-17T21:12:05.934
+C Undo\schange\sto\s'analyze9.test'\sbecause\sthe\sextra\soutput\scan\sbe\suseful\sfor\sdebugging.
+D 2019-04-18T17:37:19.793
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -519,7 +519,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
-F src/shell.c.in 0d1a1abd8f1056ac6b32981442618e988e1e192cec2e904e58c72fcf494c901e
+F src/shell.c.in 903dafb0aef7d6e845aca9def527d714335f0e5e8f2d96b7deb4f7eb7abf7f0b
 F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -528,7 +528,7 @@ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
 F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424
-F src/test1.c 0dc98af0769302672dcefd07a6128ee14e837b9f6e338a1aaca7ac31e4d8d2f8
+F src/test1.c 3b1820d24f806c996c3f6d1456624d8aa03698eeb97d2b179b220a1d2e803b04
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@ -548,7 +548,7 @@ F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf
 F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e
 F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
-F src/test_func.c 181f992e5495644434c4f0e3cc72362a78c295eb2cf3ff4d02498b8bde7aa276
+F src/test_func.c 9180857ac71f9001ef899edce62b02119c1d20b4e7ee152642ba64272898af49
 F src/test_hexio.c 1d4469ca61ab202a1fcec6543f584d2407205e8d
 F src/test_init.c 4413c211a94b62157ca4c145b3f27c497f03c664
 F src/test_intarray.c 39b4181662a0f33a427748d87218e7578d913e683dc27eab7098bb41617cac71
@@ -1818,7 +1818,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 57638248de147efe8d663b3ae1389f590c7b2b7225ecfe295699d68c2893cd09
-R f55569b51e361d573aabfbfaa6d9bc9b
-U drh
-Z 08f602e532329cf65b2b6561fc1b8227
+P 1f1866d11c2fe3804ebc64cc7a54061c1d6db8650c2f19b43b70831afee53f2a
+R 5158dd629d595e98f0a10e54cb88f632
+U mistachkin
+Z dcf04ec3a4b24653501f8c26b03685dd

manifest.uuid

@@ -1 +1 @@
-03f2e78899fad99b0a0951b3a408268276954d4cd785389ed9a0192c9217f6fe
+f3081e59091646f97a5208bf47f138f6d55ecf5198b6d060df892e53b12ed510

src/shell.c.in

@@ -3858,7 +3858,11 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
   int j, k;
   int rc;
   FILE *in;
+#if !defined(_MSC_VER) || _MSC_VER>=1900
   unsigned char x[16];
+#else
+  unsigned int x[16];
+#endif
   char zLine[1000];
   if( p->zDbFilename ){
     in = fopen(p->zDbFilename, "r");
@@ -3903,7 +3907,14 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
     if( rc==17 ){
       k = iOffset+j;
       if( k+16<=n ){
+#if !defined(_MSC_VER) || _MSC_VER>=1900
         memcpy(a+k, x, 16);
+#else
+        int ii;
+        for(ii=0; ii<16; ii++){
+          a[k+ii] = (unsigned char)x[ii];
+        }
+#endif
       }
     }
   }

src/test1.c

@@ -7699,7 +7699,11 @@ static int SQLITE_TCLAPI test_decode_hexdb(
   int iOffset = 0;
   int j, k;
   int rc;
+#if !defined(_MSC_VER) || _MSC_VER>=1900
   unsigned char x[16];
+#else
+  unsigned int x[16];
+#endif
   if( objc!=2 ){
     Tcl_WrongNumArgs(interp, 1, objv, "HEXDB");
     return TCL_ERROR;
@@ -7738,7 +7742,14 @@ static int SQLITE_TCLAPI test_decode_hexdb(
     if( rc==17 ){
       k = iOffset+j;
       if( k+16<=n ){
+#if !defined(_MSC_VER) || _MSC_VER>=1900
         memcpy(a+k, x, 16);
+#else
+        int ii;
+        for(ii=0; ii<16; ii++){
+          a[k+ii] = (unsigned char)x[ii];
+        }
+#endif
       }
       continue;
     }

src/test_func.c

@@ -529,6 +529,13 @@ static void test_decode(
   u8 *pBody;                      /* Current point in record data */
   u64 nHdr;                       /* Bytes in record header */
   Tcl_Obj *pRet;                  /* Return value */
+  Mem *pMem;                      /* Pointer to memory cell */
+
+  pMem = sqlite3_malloc(sizeof(Mem));
+  if( pMem==0 ){
+    sqlite3_result_error_nomem(context);
+    return;
+  }
 
   pRet = Tcl_NewObj();
   Tcl_IncrRefCount(pRet);
@@ -541,17 +548,16 @@ static void test_decode(
   while( pHdr<pEndHdr ){
     Tcl_Obj *pVal = 0;
     u64 iSerialType;
-    Mem mem;
 
-    memset(&mem, 0, sizeof(mem));
-    mem.db = db;
-    mem.enc = ENC(db);
+    memset(pMem, 0, sizeof(Mem));
+    pMem->db = db;
+    pMem->enc = ENC(db);
     pHdr += sqlite3GetVarint(pHdr, &iSerialType);
-    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, &mem);
+    pBody += sqlite3VdbeSerialGet(pBody, (u32)iSerialType, pMem);
 
-    switch( sqlite3_value_type(&mem) ){
+    switch( sqlite3_value_type(pMem) ){
       case SQLITE_TEXT:
-        pVal = Tcl_NewStringObj((const char*)sqlite3_value_text(&mem), -1);
+        pVal = Tcl_NewStringObj((const char*)sqlite3_value_text(pMem), -1);
         break;
 
       case SQLITE_BLOB: {
@@ -559,8 +565,8 @@ static void test_decode(
           '0', '1', '2', '3', '4', '5', '6', '7',
           '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
         };
-        int n = sqlite3_value_bytes(&mem);
-        u8 *z = (u8*)sqlite3_value_blob(&mem);
+        int n = sqlite3_value_bytes(pMem);
+        u8 *z = (u8*)sqlite3_value_blob(pMem);
         int i;
         pVal = Tcl_NewStringObj("x'", -1);
         for(i=0; i<n; i++){
@@ -575,11 +581,11 @@ static void test_decode(
       }
 
       case SQLITE_FLOAT:
-        pVal = Tcl_NewDoubleObj(sqlite3_value_double(&mem));
+        pVal = Tcl_NewDoubleObj(sqlite3_value_double(pMem));
         break;
 
       case SQLITE_INTEGER:
-        pVal = Tcl_NewWideIntObj(sqlite3_value_int64(&mem));
+        pVal = Tcl_NewWideIntObj(sqlite3_value_int64(pMem));
         break;
 
       case SQLITE_NULL:
@@ -592,13 +598,14 @@ static void test_decode(
 
     Tcl_ListObjAppendElement(0, pRet, pVal);
 
-    if( mem.szMalloc ){
-      sqlite3DbFree(db, mem.zMalloc);
+    if( pMem->szMalloc ){
+      sqlite3DbFree(db, pMem->zMalloc);
     }
   }
 
   sqlite3_result_text(context, Tcl_GetString(pRet), -1, SQLITE_TRANSIENT);
   Tcl_DecrRefCount(pRet);
+  sqlite3_free(pMem);
 }
 
 /*