Make sure pragma integrity_check does not report "ok" after first finding

a bunch of errors. (CVS 2744)

FossilOrigin-Name: efec04dedfff8b92527b42e59cc32b4f69031021

diff --git a/manifest b/manifest
index b7c59138506d7c68e24cebf76bd978409562970b..b4d27ca530f909cdef0fe8d69f5814ad06ed5f94 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert\sor\smemory\sleak\sthat\soccurs\swhen\strying\sto\sEXPLAIN\sa\sstatement\nother\sthan\sa\sSELECT\sthat\soutputs\sresults.\s\sExamples\sof\ssuch\sstatements\ninclude\sPRAGMA\sintegrity_check\sor\sINSERT/DELETE/UPDATE\swith\sPRAGMA\ncount_changes=ON.\s(CVS\s2743)
-D 2005-10-05T11:35:09
+C Make\ssure\spragma\sintegrity_check\sdoes\snot\sreport\s"ok"\safter\sfirst\sfinding\na\sbunch\sof\serrors.\s(CVS\s2744)
+D 2005-10-05T11:41:48
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -60,7 +60,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
 F src/pager.c adbb27f13ac75cd5bc29a3d84803e0cab1edfa88
 F src/pager.h e7b41ce8e7b5f629d456708b7ad9a8c8ede37140
 F src/parse.y 5602d5cb894dda2932bf50b7e88782a4440ae3ae
-F src/pragma.c 126149668aa7086e86cfa3e32c8523513c19dd63
+F src/pragma.c 278c8fe2e2e1a0a6843841135648b7b9ad7cbd51
 F src/prepare.c fc098db25d2a121affb08686cf04833fd50452d4
 F src/printf.c bd421c1ad5e01013c89af63c60eab02852ccd15e
 F src/random.c 90adff4e73a3b249eb4f1fc2a6ff9cf78c7233a4
@@ -314,7 +314,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P e80fecc986f1fe93e127398b081054766c5383cf
-R 1631acbffa5851a1d52a1c865ed7e829
+P 533a85eee2370aafe204ff3eed50eb7fc0149e83
+R 52d72599a931bc7457a8d47ca8860b28
 U drh
-Z d0b72eae3ce1e3a73f9f18a3c879cfee
+Z 877358ebb5a181476f6d3845c89f60bf

diff --git a/manifest.uuid b/manifest.uuid
index b6246df2092ac4486366be7c40627fc2a45adf76..07d2796258e47889db464f0ba0e6f9a09fe7da8d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-533a85eee2370aafe204ff3eed50eb7fc0149e83
\ No newline at end of file
+efec04dedfff8b92527b42e59cc32b4f69031021
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 445ff36aef6131f848ce3c449eab312317ff6b48..ba7a753eb04e83287de1781fe8808929434563bd 100644 (file)
--- 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.100 2005/09/20 17:42:23 drh Exp $
+** $Id: pragma.c,v 1.101 2005/10/05 11:41:48 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -677,6 +677,7 @@ void sqlite3Pragma(
       sqlite3VdbeAddOp(v, OP_Pull, 1, 0);
       sqlite3VdbeAddOp(v, OP_Concat, 0, 1);
       sqlite3VdbeAddOp(v, OP_Callback, 1, 0);
+      sqlite3VdbeAddOp(v, OP_MemIncr, 0, 0);
 
       /* Make sure all the indices are constructed correctly.
       */