Minor fix to the display of oversized KeyInfo structures in the P4 operand

of Open opcodes in EXPLAIN output.

FossilOrigin-Name: f65a9b4ab2c6f0b7028e16e2a0f83fd6d58ae1cd
This commit is contained in:
drh 2015-08-15 16:32:50 +00:00
parent e31dc59b4c
commit d5a74c8e19
3 changed files with 9 additions and 8 deletions

View File

@ -1,5 +1,5 @@
C Duplicate\sthe\soutput\sof\sreleasetest.tcl\sinto\sreleasetest-out.txt C Minor\sfix\sto\sthe\sdisplay\sof\soversized\sKeyInfo\sstructures\sin\sthe\sP4\soperand\nof\sOpen\sopcodes\sin\sEXPLAIN\soutput.
D 2015-08-14T12:53:37.201 D 2015-08-15T16:32:50.350
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380 F Makefile.in 2fc9ca6bf5949d415801c007ed3004a4bdb7c380
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -402,7 +402,7 @@ F src/vdbe.c 2ab1decd98925f8cd846993dde9dccaa69cdf0ef
F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473 F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473
F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816 F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816
F src/vdbeapi.c adabbd66eb2e3a10f3998485ee0be7e326d06ee4 F src/vdbeapi.c adabbd66eb2e3a10f3998485ee0be7e326d06ee4
F src/vdbeaux.c 787f5f9d58f4c6f39294ed06909ba602d1a402e6 F src/vdbeaux.c af2d86b2b114a106c94fc656503fc5c89594f5af
F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90
F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090 F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090
F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
@ -1373,7 +1373,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 851a875ad6b81f90960caf4d03b116afc911858d P 5e06a9c186f4b7478c73155613de219d702e0241
R 516c4f09812f47621a9f17c1076f8b21 R e2d0516338dae0688a20852b1e6916a7
U drh U drh
Z 7ae775e3576234c15153da91a23c9d24 Z 80e45157bf277dcf2578e84040f9a7f0

View File

@ -1 +1 @@
5e06a9c186f4b7478c73155613de219d702e0241 f65a9b4ab2c6f0b7028e16e2a0f83fd6d58ae1cd

View File

@ -1094,8 +1094,9 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
zColl = "B"; zColl = "B";
n = 1; n = 1;
} }
if( i+n>nTemp-6 ){ if( i+n>nTemp-7 ){
memcpy(&zTemp[i],",...",4); memcpy(&zTemp[i],",...",4);
i += 4;
break; break;
} }
zTemp[i++] = ','; zTemp[i++] = ',';