diff options
| author | drh <drh@noemail.net> | 2008-03-19 00:21:30 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-03-19 00:21:30 +0000 |
| commit | bb8a279e11c2df4b9bc67bb863659b18b1cb6423 (patch) | |
| tree | f31e6c0ceab1b3202f03cc0d853d1e5a1bd66d69 /src | |
| parent | aa28e1478abe8a6edd4fee5217258c740d30b95a (diff) | |
| download | sqlite-bb8a279e11c2df4b9bc67bb863659b18b1cb6423.tar.gz sqlite-bb8a279e11c2df4b9bc67bb863659b18b1cb6423.zip | |
Remove the dependency on the direct btree interface from as many test
scripts as is practical. Fix a bug in the output limiter of the
integrity_check pragma that came up while making this change. (CVS 4880)
FossilOrigin-Name: 24e769972eb6052b82dc94d20444c186a213e104
Diffstat (limited to 'src')
| -rw-r--r-- | src/pragma.c | 5 | ||||
| -rw-r--r-- | src/test2.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/pragma.c b/src/pragma.c index 4019ca77a..067426d11 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: pragma.c,v 1.170 2008/02/13 18:25:27 danielk1977 Exp $ +** $Id: pragma.c,v 1.171 2008/03/19 00:21:31 drh Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -937,6 +937,8 @@ void sqlite3Pragma( { OP_Concat, 5, 3, 3}, { OP_Concat, 6, 3, 3}, { OP_ResultRow, 3, 1, 0}, + { OP_IfPos, 1, 0, 0}, /* 9 */ + { OP_Halt, 0, 0, 0}, }; sqlite3GenerateIndexKey(pParse, pIdx, 1, 3); jmp2 = sqlite3VdbeAddOp3(v, OP_Found, j+2, 0, 3); @@ -944,6 +946,7 @@ void sqlite3Pragma( sqlite3VdbeChangeP4(v, addr+1, "rowid ", P4_STATIC); sqlite3VdbeChangeP4(v, addr+3, " missing from index ", P4_STATIC); sqlite3VdbeChangeP4(v, addr+4, pIdx->zName, P4_STATIC); + sqlite3VdbeJumpHere(v, addr+9); sqlite3VdbeJumpHere(v, jmp2); } sqlite3VdbeAddOp2(v, OP_Next, 1, loopTop+1); diff --git a/src/test2.c b/src/test2.c index 153806cde..d326a91d8 100644 --- a/src/test2.c +++ b/src/test2.c @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test2.c,v 1.54 2008/03/07 19:51:14 drh Exp $ +** $Id: test2.c,v 1.55 2008/03/19 00:21:31 drh Exp $ */ #include "sqliteInt.h" #include "tcl.h" @@ -717,8 +717,6 @@ int Sqlitetest2_Init(Tcl_Interp *interp){ (char*)&sqlite3_diskfull, TCL_LINK_INT); Tcl_LinkVar(interp, "sqlite_pending_byte", (char*)&sqlite3_pending_byte, TCL_LINK_INT); - Tcl_LinkVar(interp, "pager_pagesize", - (char*)&test_pagesize, TCL_LINK_INT); Tcl_LinkVar(interp, "sqlite_pager_n_sort_bucket", (char*)&sqlite3_pager_n_sort_bucket, TCL_LINK_INT); return TCL_OK; |