mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Increase the maximum length of an sqlite3_log() result string. Provide more

Browse Source 
details on the statement abort log message.

FossilOrigin-Name: 5322d1df5ba981001d248b7fb2ee02281e4f9723
This commit is contained in:
drh 2010-03-04 00:53:32 +00:00
parent ccd0489baa
commit a64fa9123e
4 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifest
View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Pull\sthe\slatest\sLemon\supdates\sfrom\sthe\slemon-update-2010\sbranch\sinto\nthe\strunk. C Increase\sthe\smaximum\slength\sof\san\ssqlite3_log()\sresult\sstring.\s\sProvide\smore\ndetails\son\sthe\sstatement\sabort\slog\smessage.
D 2010-03-03T22:43:38 D 2010-03-04T00:53:33
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -163,7 +163,7 @@ F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
F src/pragma.c 56d95f76154a5f873c32eae485bb625f3c70be46 F src/pragma.c 56d95f76154a5f873c32eae485bb625f3c70be46
F src/prepare.c c80630169d82945070a50ebf298611fd9f1485f1 F src/prepare.c c80630169d82945070a50ebf298611fd9f1485f1
F src/printf.c e2b8c9c8d34583dbda4a09fbcb95c522e8467344 F src/printf.c 10b7034923dae17e7540ca77aa9cddcb28f4c75f
F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b
F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
@ -214,7 +214,7 @@ F src/update.c c0dc6b75ad28b76b619042d934f337b02acee208
F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
F src/util.c c076b2e38134d71ed09fee62ee788ad2d4121b93 F src/util.c c076b2e38134d71ed09fee62ee788ad2d4121b93
F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee F src/vacuum.c b1d542c8919d4d11119f78069e1906a1ad07e0ee
F src/vdbe.c 8b705e48cf4b6d0493ad0f109763d60c1b429487 F src/vdbe.c 4d8ff247c30d41eb96d7eb4f620baecaf887efb8
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3 F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
F src/vdbeInt.h ae1e6ba0dd3fb4a886898d2829d748be701b01f8 F src/vdbeInt.h ae1e6ba0dd3fb4a886898d2829d748be701b01f8
F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc F src/vdbeapi.c 74c25680046a116b24b95393914d3669c23305dc
@ -795,14 +795,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 28d1bc98d60319b10af427072037a0121bc76259 83495128c820e963c70d11c3196f81d8cf01f867 P 84d760bfc1d219fda99901061bb5db2cafe9eb1d
R 5bcf7657cf8259e9279d36af5e2c5c7b R 952c1e46748606994709a17ed2dc102e
U drh U drh
Z 0f9492b8396c3d749ab3aae315e18f6d Z 6ab237967302805fc460ab0eaddd0a85
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLjuYeoxKgR168RlERAlrSAKCA0xyD30EEpNmtBDVfUAqmfk5EZACeO+r+ iD8DBQFLjwSQoxKgR168RlERAg4GAJ99wdO6zHQ+BQheTEebbxyfPgVwrwCfYERl
rLgIbkZX3mD3k7SGIl1BSp4= d/IAf2HBq2gWIzTZvGEQx8Q=
=sB+r =kHv9
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
84d760bfc1d219fda99901061bb5db2cafe9eb1d 5322d1df5ba981001d248b7fb2ee02281e4f9723

12
src/printf.c
View File

@ -606,9 +606,7 @@ void sqlite3VXPrintf(
while( nPad-- ) bufpt[i++] = '0'; while( nPad-- ) bufpt[i++] = '0';
length = width; length = width;
} }
#else #endif
length = 0;
#endif /* SQLITE_OMIT_FLOATING_POINT */
break; break;
case etSIZE: case etSIZE:
*(va_arg(ap,int*)) = pAccum->nChar; *(va_arg(ap,int*)) = pAccum->nChar;
@ -949,12 +947,8 @@ char *sqlite3_snprintf(int n, char *zBuf, const char *zFormat, ...){
** mutex is held. ** mutex is held.
*/ */
static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){ static void renderLogMsg(int iErrCode, const char *zFormat, va_list ap){
StrAccum acc; /* String accumulator */ StrAccum acc; /* String accumulator */
#ifdef SQLITE_SMALL_STACK char zMsg[SQLITE_PRINT_BUF_SIZE*3]; /* Complete log message */
char zMsg[150]; /* Complete log message */
#else
char zMsg[400]; /* Complete log message */
#endif
sqlite3StrAccumInit(&acc, zMsg, sizeof(zMsg), 0); sqlite3StrAccumInit(&acc, zMsg, sizeof(zMsg), 0);
acc.useMalloc = 0; acc.useMalloc = 0;

4
src/vdbe.c
View File

@ -5703,7 +5703,9 @@ default: { /* This is really OP_Noop and OP_Explain */
vdbe_error_halt: vdbe_error_halt:
assert( rc ); assert( rc );
p->rc = rc; p->rc = rc;
sqlite3_log(rc, "prepared statement aborts at %d: [%s]", pc, p->zSql); testcase( sqlite3GlobalConfig.xLog!=0 );
sqlite3_log(rc, "statement aborts at %d: [%s] %s",
pc, p->zSql, p->zErrMsg);
sqlite3VdbeHalt(p); sqlite3VdbeHalt(p);
if( rc==SQLITE_IOERR_NOMEM ) db->mallocFailed = 1; if( rc==SQLITE_IOERR_NOMEM ) db->mallocFailed = 1;
rc = SQLITE_ERROR; rc = SQLITE_ERROR;