aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2015-03-20 16:34:49 +0000
committerdrh <drh@noemail.net>2015-03-20 16:34:49 +0000
commit1fa509afa16471c37d92b8114c5cc9bce2c61c4d (patch)
tree116e4d8bf735cd5074e001c8442035cfae53370b /src
parente0997b341b1ee889e05acf07e80e5d2fc80d71b1 (diff)
downloadsqlite-1fa509afa16471c37d92b8114c5cc9bce2c61c4d.tar.gz
sqlite-1fa509afa16471c37d92b8114c5cc9bce2c61c4d.zip
Fix to get SQLITE_SMALL_STACK working correctly again after the previous change.
FossilOrigin-Name: 78df0ce13d4f35226f2571bd7de78484ccbee4bb
Diffstat (limited to 'src')
-rw-r--r--src/vdbe.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/vdbe.c b/src/vdbe.c
index 9a9503967..8eb772108 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3235,7 +3235,14 @@ case OP_SetCookie: { /* in3 */
** See also OpenRead.
*/
case OP_ReopenIdx: {
+ int nField;
+ KeyInfo *pKeyInfo;
+ int p2;
+ int iDb;
+ int wrFlag;
+ Btree *pX;
VdbeCursor *pCur;
+ Db *pDb;
assert( pOp->p5==0 || pOp->p5==OPFLAG_SEEKEQ );
assert( pOp->p4type==P4_KEYINFO );
@@ -3246,17 +3253,8 @@ case OP_ReopenIdx: {
}
/* If the cursor is not currently open or is open on a different
** index, then fall through into OP_OpenRead to force a reopen */
-}
case OP_OpenRead:
-case OP_OpenWrite: {
- int nField;
- KeyInfo *pKeyInfo;
- int p2;
- int iDb;
- int wrFlag;
- Btree *pX;
- VdbeCursor *pCur;
- Db *pDb;
+case OP_OpenWrite:
assert( (pOp->p5&(OPFLAG_P2ISREG|OPFLAG_BULKCSR|OPFLAG_SEEKEQ))==pOp->p5 );
assert( pOp->opcode==OP_OpenWrite || pOp->p5==0 || pOp->p5==OPFLAG_SEEKEQ );