1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-08 14:02:16 +03:00

Make sure system errors that occur durign sqlite3_step() are captured for

use by sqlite3_system_errno().

FossilOrigin-Name: b4a1114f730c62e93623f889bc0e4fd8d0b31efa
This commit is contained in:
drh
2016-03-21 12:28:02 +00:00
parent 80fbee092e
commit f68521c4e6
3 changed files with 8 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
C Improved\scomments.\s\sNo\slogical\schanges\sto\scode. C Make\ssure\ssystem\serrors\sthat\soccur\sdurign\ssqlite3_step()\sare\scaptured\sfor\nuse\sby\ssqlite3_system_errno().
D 2016-03-21T11:57:13.971 D 2016-03-21T12:28:02.060
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@@ -417,7 +417,7 @@ F src/update.c 56b3db7edff0110360a12b76af97c39ebe3ea8b8
F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
F src/util.c cf7dce85ab9af5280b8a45985df2591efbfefe56 F src/util.c cf7dce85ab9af5280b8a45985df2591efbfefe56
F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
F src/vdbe.c 3b542ffd5b6aaab55255ec3801fc86dcbfaea543 F src/vdbe.c f19741f2d8b33e8f09cd2219570b6c9ed924c3f1
F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101 F src/vdbe.h 6f44193e7be52fd5f7c308175a936555b1e6b101
F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991 F src/vdbeInt.h f88d3115e9bde33b01d81f0dd26d8dd51f995991
F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009 F src/vdbeapi.c 95b1f8e527240a18a9aea41a655b013bf07a7009
@@ -1457,7 +1457,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 7d49998d571d841a6d1b55f5f9889e613daaab2a P a6b6c6c466f3feb257b4fc08ef6b9a27a68ca073
R 2f9bb272499f0485ddab735cd0415aba R 6870e1f7d1e452978a882de2dd2b0506
U drh U drh
Z ece300b1b257b87eefa9cd94f35c2874 Z 3347e0ff1ad1a288a0d7114b0f195e81

View File

@@ -1 +1 @@
a6b6c6c466f3feb257b4fc08ef6b9a27a68ca073 b4a1114f730c62e93623f889bc0e4fd8d0b31efa

View File

@@ -6826,6 +6826,7 @@ abort_due_to_error:
sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc)); sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc));
} }
p->rc = rc; p->rc = rc;
sqlite3SystemError(db, rc);
testcase( sqlite3GlobalConfig.xLog!=0 ); testcase( sqlite3GlobalConfig.xLog!=0 );
sqlite3_log(rc, "statement aborts at %d: [%s] %s", sqlite3_log(rc, "statement aborts at %d: [%s] %s",
(int)(pOp - aOp), p->zSql, p->zErrMsg); (int)(pOp - aOp), p->zSql, p->zErrMsg);