Fix to get SQLITE_SMALL_STACK working correctly again after the previous change.
FossilOrigin-Name: 78df0ce13d4f35226f2571bd7de78484ccbee4bb
diff --git a/manifest b/manifest
index 58f3acf..a189700 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Provide\sthe\sBTREE_SEEK_EQ\shint\sto\sthe\sb-tree\slayer.
-D 2015-03-20T14:57:50.128
+C Fix\sto\sget\sSQLITE_SMALL_STACK\sworking\scorrectly\sagain\safter\sthe\sprevious\schange.
+D 2015-03-20T16:34:49.236
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -293,7 +293,7 @@
F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
-F src/vdbe.c 64d8325aed2020a8aa3bd1f6352d0b129299b2fa
+F src/vdbe.c 3d96875d883c2bf53a4806c9d4c5abff18511da4
F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a
F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
@@ -1246,7 +1246,7 @@
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P eddc05e7bb31fae74daa86e0504a3478b99fa0f2
-R 6b21b0e98ee76d198c2b5163fdb0b4f7
+P e750830f1e61160c0c67e35b13e50b35a95b50e1
+R 05881cbceea02fa7c850b941dd3796f0
U drh
-Z 5cff4e9435b6ae28710f92cbaff291bb
+Z 82007846a68ff2bd965c38cd8d002f35
diff --git a/manifest.uuid b/manifest.uuid
index 58a06b4..49f8754 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e750830f1e61160c0c67e35b13e50b35a95b50e1
\ No newline at end of file
+78df0ce13d4f35226f2571bd7de78484ccbee4bb
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index 9a95039..8eb7721 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -3235,7 +3235,14 @@
** 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 @@
}
/* 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 );