diff options
| author | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-05 14:15:34 +0000 |
| commit | 0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546 (patch) | |
| tree | 1d545d99bb6eac2e377e894a275770afff9b1a3d /src/vdbeblob.c | |
| parent | 33c1eb64772caf48a33d92e1a3c5a577c9ba1aa9 (diff) | |
| parent | 0539702b8e9a54b2c8cbc28db6666570700fc1c8 (diff) | |
| download | sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.tar.gz sqlite-0ac7cfaf9971681079f6e9d7ab4f7f2b2f376546.zip | |
Merge enhancements from trunk.
FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4
Diffstat (limited to 'src/vdbeblob.c')
| -rw-r--r-- | src/vdbeblob.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/vdbeblob.c b/src/vdbeblob.c index 7d343d742..f2b3ffef2 100644 --- a/src/vdbeblob.c +++ b/src/vdbeblob.c @@ -253,19 +253,17 @@ int sqlite3_blob_open( ** which closes the b-tree cursor and (possibly) commits the ** transaction. */ - static const int iLn = VDBE_OFFSET_LINENO(4); + static const int iLn = VDBE_OFFSET_LINENO(2); static const VdbeOpList openBlob[] = { - /* addr/ofst */ - /* {OP_Transaction, 0, 0, 0}, // 0/ inserted separately */ - {OP_TableLock, 0, 0, 0}, /* 1/0: Acquire a read or write lock */ - {OP_OpenRead, 0, 0, 0}, /* 2/1: Open a cursor */ - {OP_Variable, 1, 1, 0}, /* 3/2: Move ?1 into reg[1] */ - {OP_NotExists, 0, 8, 1}, /* 4/3: Seek the cursor */ - {OP_Column, 0, 0, 1}, /* 5/4 */ - {OP_ResultRow, 1, 0, 0}, /* 6/5 */ - {OP_Goto, 0, 3, 0}, /* 7/6 */ - {OP_Close, 0, 0, 0}, /* 8/7 */ - {OP_Halt, 0, 0, 0}, /* 9/8 */ + {OP_TableLock, 0, 0, 0}, /* 0: Acquire a read or write lock */ + {OP_OpenRead, 0, 0, 0}, /* 1: Open a cursor */ + {OP_Variable, 1, 1, 0}, /* 2: Move ?1 into reg[1] */ + {OP_NotExists, 0, 7, 1}, /* 3: Seek the cursor */ + {OP_Column, 0, 0, 1}, /* 4 */ + {OP_ResultRow, 1, 0, 0}, /* 5 */ + {OP_Goto, 0, 2, 0}, /* 6 */ + {OP_Close, 0, 0, 0}, /* 7 */ + {OP_Halt, 0, 0, 0}, /* 8 */ }; Vdbe *v = (Vdbe *)pBlob->pStmt; int iDb = sqlite3SchemaToIndex(db, pTab->pSchema); |