Improved debugging output from the OP_MakeRecord opcode.

FossilOrigin-Name: ac790729d9c8f8612936bab56dca6061408007bc2150ac8c7089132403d7f885

diff --git a/manifest b/manifest
index bde30235f22a0a6fca0c848dfbc0cd9855058296..df8dca63d0e25022cdabd1f6037d3456d12eaa0d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sanother\scorruption\srelated\sbuffer\soverread\sin\sthe\ssqlite_dbdata\smodule.
-D 2019-05-09T15:51:27.509
+C Improved\sdebugging\soutput\sfrom\sthe\sOP_MakeRecord\sopcode.
+D 2019-05-09T16:22:51.204
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -593,7 +593,7 @@ F src/upsert.c 0dd81b40206841814d46942a7337786932475f085716042d0cb2fc7791bf8ca4
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 5061987401c2e8003177fa30d73196aa036727c8f04bf36a2df0c82b1904a236
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
-F src/vdbe.c 5612b064d4c5d59efa0be7209ba8b631a534b16cebc63f2899eb887505dfcf2f
+F src/vdbe.c d4efd6e5ecff8eeef280ce5d622dc2c0cfe085014e5813401b346517574adb18
 F src/vdbe.h 712bca562eaed1c25506b9faf9680bdc75fc42e2f4a1cd518d883fa79c7a4237
 F src/vdbeInt.h 3ba14553508d66f58753952d6dd287dce4ec735de02c6440858b4891aed51c17
 F src/vdbeapi.c f9161e5c77f512fbb80091ce8af621d19c9556bda5e734cffaac1198407400da
@@ -1825,7 +1825,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 dbc6a9f7f67256dea96d3245e7bec145ba65d64adf322e18f1f3ac9556b4e0b6
-R 125e456f1f71a5717f889e188e54ba04
-U dan
-Z c2cff423821faf29bb80557b4a1985e5
+P 5cd728fb6b3a70f795306d4d6e12151a4de327f801733a8558139e3cd76fe66a
+R 94a11799ce99547c8388638d55d2efb8
+U drh
+Z 61ac47a2d0ae07669269cf3a1070857c

diff --git a/manifest.uuid b/manifest.uuid
index 18f9e77132bfa0bd4e6e1bb6e24897f5d797a149..52e69a97dbc7a9f4ee44fc55f7fba4d1eda70855 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5cd728fb6b3a70f795306d4d6e12151a4de327f801733a8558139e3cd76fe66a
\ No newline at end of file
+ac790729d9c8f8612936bab56dca6061408007bc2150ac8c7089132403d7f885
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index e43f2229f274cb9c66036b438d281d9c86e6316b..28916100df29aae6585952bc589262f1ca5aedcb 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2882,7 +2882,10 @@ case OP_MakeRecord: {
   if( zAffinity ){
     pRec = pData0;
     do{
-      applyAffinity(pRec++, *(zAffinity++), encoding);
+      applyAffinity(pRec, zAffinity[0], encoding);
+      REGISTER_TRACE((int)(pRec-aMem), pRec);
+      zAffinity++;
+      pRec++;
       assert( zAffinity[0]==0 || pRec<=pLast );
     }while( zAffinity[0] );
   }