mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include the SOURCE_ID value in the log messages output for corruption, misuse, 

and CANTOPEN errors.

FossilOrigin-Name: 1727a81fed65bebfea43e0bda271584096d82785
This commit is contained in:
drh 2010-06-23 17:59:51 +00:00
parent bd9676c19e
commit 75e876be30
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manifest
View File

@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Adjust\sthe\sshared-memory\slocking\srange\sto\saccount\sfor\sthe\snew\sversion\snumber\nvalues\sin\sthe\swal-index\sheader. C Include\sthe\sSOURCE_ID\svalue\sin\sthe\slog\smessages\soutput\sfor\scorruption,\smisuse,\nand\sCANTOPEN\serrors.
D 2010-06-23T17:58:38 D 2010-06-23T17:59:51
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -138,7 +138,7 @@ F src/journal.c b0ea6b70b532961118ab70301c00a33089f9315c
F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581 F src/loadext.c 1c7a61ce1281041f437333f366a96aa0d29bb581
F src/main.c 4b55bb32a344b50a5388ba2636b83a3fd33dc3d5 F src/main.c a667105394a7e7d173727b96affd35f65b28e608
F src/malloc.c a08f16d134f0bfab6b20c3cd142ebf3e58235a6a F src/malloc.c a08f16d134f0bfab6b20c3cd142ebf3e58235a6a
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2 F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2
@ -828,14 +828,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 8d0f8a7f70d6fb42369411a934b30f8c8ca8322f P a6dc0df304876b51cef5402b0e21330f10aabccf
R b7911d382713bc280913044ea85d74ac R 3c7f9d599e64d6dec70bc7c57170c180
U drh U drh
Z c02c3c722b92c74f8ca12e8b8b09f756 Z 9244a95073f7520d36ae60a889c580c8
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFMIktRoxKgR168RlERAtsxAJ0cxHA2orCkfndfRThPZzc2MckIXwCfWbUY iD8DBQFMIkuaoxKgR168RlERAieUAJ46609sl3q/ImzO0GN3QRFseZ54QwCfWgHD
HRJ9VxvoUAPVm7Tk8RvSPVM= aojoUv0EOVG9VxDCwrmvb2I=
=Ypdt =/HR/
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
a6dc0df304876b51cef5402b0e21330f10aabccf 1727a81fed65bebfea43e0bda271584096d82785

11
src/main.c
View File

@ -2099,17 +2099,22 @@ int sqlite3_get_autocommit(sqlite3 *db){
int sqlite3CorruptError(int lineno){ int sqlite3CorruptError(int lineno){
testcase( sqlite3GlobalConfig.xLog!=0 ); testcase( sqlite3GlobalConfig.xLog!=0 );
sqlite3_log(SQLITE_CORRUPT, sqlite3_log(SQLITE_CORRUPT,
"database corruption found by source line %d", lineno); "database corruption at line %d of [%.10s]",
lineno, 20+sqlite3_sourceid());
return SQLITE_CORRUPT; return SQLITE_CORRUPT;
} }
int sqlite3MisuseError(int lineno){ int sqlite3MisuseError(int lineno){
testcase( sqlite3GlobalConfig.xLog!=0 ); testcase( sqlite3GlobalConfig.xLog!=0 );
sqlite3_log(SQLITE_MISUSE, "misuse detected by source line %d", lineno); sqlite3_log(SQLITE_MISUSE,
"misuse at line %d of [%.10s]",
lineno, 20+sqlite3_sourceid());
return SQLITE_MISUSE; return SQLITE_MISUSE;
} }
int sqlite3CantopenError(int lineno){ int sqlite3CantopenError(int lineno){
testcase( sqlite3GlobalConfig.xLog!=0 ); testcase( sqlite3GlobalConfig.xLog!=0 );
sqlite3_log(SQLITE_CANTOPEN, "cannot open file at source line %d", lineno); sqlite3_log(SQLITE_CANTOPEN,
"cannot open file at line %d of [%.10s]",
lineno, 20+sqlite3_sourceid());
return SQLITE_CANTOPEN; return SQLITE_CANTOPEN;
} }