diff options
| author | drh <drh@noemail.net> | 2014-11-17 17:13:06 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-11-17 17:13:06 +0000 |
| commit | 77b1deec400c40676dfca2986dbf659af548c40f (patch) | |
| tree | 73cdb68ad13705d22a7b91c035107fc1cda96739 /src | |
| parent | 13835c41e824eb2b6a7d504c4df2066fe4ad6c52 (diff) | |
| download | sqlite-77b1deec400c40676dfca2986dbf659af548c40f.tar.gz sqlite-77b1deec400c40676dfca2986dbf659af548c40f.zip | |
When a SELECT statement is terminated by a ROLLBACK TO operation, make the
error message be "abort due to ROLLBACK" rather than
"callback requested query abort".
FossilOrigin-Name: 34fc4a082c192830e48f643549c04a4f91912b8b
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 1ad8aab75..9a8db1a63 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -2827,7 +2827,8 @@ case OP_Savepoint: { if( p1==SAVEPOINT_ROLLBACK ){ isSchemaChange = (db->flags & SQLITE_InternChanges)!=0; for(ii=0; ii<db->nDb; ii++){ - rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, SQLITE_ABORT, + rc = sqlite3BtreeTripAllCursors(db->aDb[ii].pBt, + SQLITE_ABORT_ROLLBACK, isSchemaChange==0); if( rc!=SQLITE_OK ) goto abort_due_to_error; } |