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

Make sure the savepoint index is correct one calls to sqlite3VtabSavepoint

with SAVEPOINT_BEGIN.

FossilOrigin-Name: a9d095660ca0e99b226e0fe669c11a0be6c49710
This commit is contained in:
drh
2011-05-24 00:35:56 +00:00
parent a12b6fa392
commit a24bc9ced3
3 changed files with 9 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
C Minor\scleanups\sto\sthe\sheader\scomments\son\svarious\stest_*.c\sfile,\sto\smake\nthe\ssuitable\sfor\sprogrammer-level\sdocumentation. C Make\ssure\sthe\ssavepoint\sindex\sis\scorrect\sone\scalls\sto\ssqlite3VtabSavepoint\nwith\sSAVEPOINT_BEGIN.
D 2011-05-23T18:37:42.742 D 2011-05-24T00:35:56.199
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -236,7 +236,7 @@ F src/update.c 5bcb56e5c7380a2eecb0e71891dbd4ad7437748f
F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60 F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70 F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
F src/vdbe.c 343a068e8daeb8475e66776feb9f2974046e95c5 F src/vdbe.c 408cc051fab3f16af2ccfe5a5eb0c86499ebb10c
F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797 F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1 F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
@@ -938,7 +938,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 139a8f53ae1979591734a8244fb33655a6499193 P a65d043a2ad895b931871c67e0ef397a1dc614a6
R 135e5df582474459d4ad1ce32ee0336a R 94ee8b905e59bc1d32642c15b01f0858
U drh U drh
Z 551eea5e1688e783dfd89f144647d748 Z 1f18a51d1c1bfd3a78b89267e4416239

View File

@@ -1 +1 @@
a65d043a2ad895b931871c67e0ef397a1dc614a6 a9d095660ca0e99b226e0fe669c11a0be6c49710

View File

@@ -2589,7 +2589,8 @@ case OP_Savepoint: {
** If this is a transaction savepoint being opened, it is guaranteed ** If this is a transaction savepoint being opened, it is guaranteed
** that the db->aVTrans[] array is empty. */ ** that the db->aVTrans[] array is empty. */
assert( db->autoCommit==0 || db->nVTrans==0 ); assert( db->autoCommit==0 || db->nVTrans==0 );
rc = sqlite3VtabSavepoint(db, SAVEPOINT_BEGIN, p->iStatement); rc = sqlite3VtabSavepoint(db, SAVEPOINT_BEGIN,
db->nStatement+db->nSavepoint);
if( rc!=SQLITE_OK ) goto abort_due_to_error; if( rc!=SQLITE_OK ) goto abort_due_to_error;
/* Create a new savepoint structure. */ /* Create a new savepoint structure. */