From 695c0266b7ebb392b99a19200b54dcfd7fb70f73 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 7 Apr 2009 22:05:43 +0000 Subject: [PATCH] Remove two unused tests from the integrity_check pragma logic. (CVS 6466) FossilOrigin-Name: 22999d31418aa9ecb17ab5d135b206b967889614 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/pragma.c | 4 +--- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index fa5584edf8..215eda81d5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sincorrect\sassert\sin\sbtree.c.\s(CVS\s6465) -D 2009-04-07T14:38:58 +C Remove\stwo\sunused\stests\sfrom\sthe\sintegrity_check\spragma\slogic.\s(CVS\s6466) +D 2009-04-07T22:05:43 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -149,7 +149,7 @@ F src/parse.y b7e4341b21736a90b952aa6bb663ec98529b778e F src/pcache.c 395f752a13574120bd7513a400ba02a265aaa76d F src/pcache.h 9b927ccc5a538e31b4c3bc7eec4f976db42a1324 F src/pcache1.c f587565f4ba0fd1772067eaa96814dce761b7a4c -F src/pragma.c e48136fdf442bcd3143d82f4a4e08bf9b185f16c +F src/pragma.c c26c16c49a80d03c8597f0e6c7daba53f283428f F src/prepare.c 0ad1ba3290e0626aa4e7589ed6ab6af2572875b0 F src/printf.c 9866a9a9c4a90f6d4147407f373df3fd5d5f9b6f F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628 @@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 277dace43d51fbc79c7a62fc841c150ecd8d0823 -R 74483128416315113cbacecd6bfd9ec0 -U danielk1977 -Z 02ca545045d4e1ee61fb3747cb34d011 +P 2c1f59834ab7a16066ee12cb8a8342d438c23ce9 +R da69fda516423dc915653709b87d09f0 +U drh +Z 1ffc7b542098adaaa0308f19da4f52e8 diff --git a/manifest.uuid b/manifest.uuid index b9e0532259..e07c64be3a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2c1f59834ab7a16066ee12cb8a8342d438c23ce9 \ No newline at end of file +22999d31418aa9ecb17ab5d135b206b967889614 \ No newline at end of file diff --git a/src/pragma.c b/src/pragma.c index bfb84305d0..f3761b1d02 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.208 2009/04/07 00:49:16 drh Exp $ +** $Id: pragma.c,v 1.209 2009/04/07 22:05:43 drh Exp $ */ #include "sqliteInt.h" @@ -1078,7 +1078,6 @@ void sqlite3Pragma( cnt++; } } - if( cnt==0 ) continue; /* Make sure sufficient number of registers have been allocated */ if( pParse->nMem < cnt+4 ){ @@ -1151,7 +1150,6 @@ void sqlite3Pragma( { OP_Concat, 3, 2, 2}, { OP_ResultRow, 2, 1, 0}, }; - if( pIdx->tnum==0 ) continue; addr = sqlite3VdbeAddOp1(v, OP_IfPos, 1); sqlite3VdbeAddOp2(v, OP_Halt, 0, 0); sqlite3VdbeJumpHere(v, addr);