Allow the error message from "PRAGMA integrity_check" to be longer than

20,000 bytes.

FossilOrigin-Name: 120c82d56ecb574f46db01679317b8062d8779ed

diff --git a/manifest b/manifest
index b0a4c45629e31ce301acde06d3fa13b2a575cb69..aef5a7ffec08ed249ddd763c5174f2bd2257456b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.7.15
-D 2012-12-12T13:36:53.477
+C Allow\sthe\serror\smessage\sfrom\s"PRAGMA\sintegrity_check"\sto\sbe\slonger\sthan\n20,000\sbytes.
+D 2012-12-12T14:30:03.521
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 690d441a758cbffd13e814dc2724a721a6ebd400
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -121,7 +121,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c cab40f2c1fe79d6eb93d3b4086c78c41ad2fa5d0
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c eccee944cb2221e919d7a855e5928d8643194b14
+F src/btree.c 7a80e4a67f32a2494c383a28a495bf3bd71cc230
 F src/btree.h 3ad7964d6c5b1c7bff569aab6adfa075f8bf06cd
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c f4f86c07002c6f3ee96c1e34e0e993a962ef2c73
@@ -1025,10 +1025,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 81d9ee0f0df7f283e69ba1c2845339ea3318cd66
-R 6da93546e03c634583a9df9f228276ed
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.7.15 *
-U dan
-Z c2b6a5ded805ac723be241fad17cc751
+P cd0b37c52658bfdf992b1e3dc467bae1835a94ae
+R c074324819c1cb0b1b063013401b3d51
+U drh
+Z 0c15681c6bbc86d62fafd9ce06645760

diff --git a/manifest.uuid b/manifest.uuid
index 940b7402c103e7ebd93c46c467b9cb7d911b6763..3f1ad31ac9db4255547741a70a900567c2ba2c01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd0b37c52658bfdf992b1e3dc467bae1835a94ae
\ No newline at end of file
+120c82d56ecb574f46db01679317b8062d8779ed
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 246843b79e39fb86a5746fcc87fb953445a166ce..bb64e643b0325eca2d1936c4f649827b43b74cae 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8026,7 +8026,7 @@ char *sqlite3BtreeIntegrityCheck(
   }
   i = PENDING_BYTE_PAGE(pBt);
   if( i<=sCheck.nPage ) setPageReferenced(&sCheck, i);
-  sqlite3StrAccumInit(&sCheck.errMsg, zErr, sizeof(zErr), 20000);
+  sqlite3StrAccumInit(&sCheck.errMsg, zErr, sizeof(zErr), SQLITE_MAX_LENGTH);
   sCheck.errMsg.useMalloc = 2;
 
   /* Check the integrity of the freelist