From: drh <drh@noemail.net>
Date: Mon, 15 Nov 2010 16:29:30 +0000 (+0000)
Subject: Fix the EQP logic so that it correctly reports OOM errors while formatting
X-Git-Tag: version-3.7.4~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03b6df1e8e9767de3d7371c3608143568252a350;p=thirdparty%2Fsqlite.git

Fix the EQP logic so that it correctly reports OOM errors while formatting
"detail" text.

FossilOrigin-Name: 136c2ac24ee1663bc0904bce1a619ecef3d11c1c
---

diff --git a/manifest b/manifest
index 1850b20e58..728cad3998 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Change\ssome\stest\scases\sto\saccount\sfor\sthe\snew\sEXPLAIN\sQUERY\sPLAN\soutput.
-D 2010-11-15T16:12:59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\sthe\sEQP\slogic\sso\sthat\sit\scorrectly\sreports\sOOM\serrors\swhile\sformatting\n"detail"\stext.
+D 2010-11-15T16:29:31
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e7a59672eaeb04408d1fa8501618d7501a3c5e39
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -239,7 +242,7 @@ F src/vtab.c b297e8fa656ab5e66244ab15680d68db0adbec30
 F src/wal.c f26b8d297bd11cb792e609917f9d4c6718ac8e0e
 F src/wal.h c1aac6593a0b02b15dc625987e619edeab39292e
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
-F src/where.c 5a982c342355588f40b1b02e1127000fe8e0a3fe
+F src/where.c f4023c5f2fa083f411f7d6fc8d277b7770196847
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
@@ -886,7 +889,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 547bc2c232cbf7b7ff295287ab8fddb880e517f9
-R 863ad3e83f428e5bfb8e9c7834fdadd1
-U dan
-Z a86da5f4e7ed6219a15e362cd53c69a5
+P 88a854e18fc6bd619fa8d8a911abff50a9b76b9e
+R 78739c63fada478c89d9f3f543943196
+U drh
+Z 248d217c09792745bf7000ce93c07b4f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFM4V/uoxKgR168RlERAp6dAJ48aRXSbqzfVJi4Eb9vXXw3gcK9oQCZAYNE
+zpwmsrlBP5VyywolG2MEBs0=
+=8eQE
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index ad8b495d45..f4e89ee29e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-88a854e18fc6bd619fa8d8a911abff50a9b76b9e
\ No newline at end of file
+136c2ac24ee1663bc0904bce1a619ecef3d11c1c
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 7c7eae17fa..9347366942 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3183,6 +3183,7 @@ static char *explainIndexRange(sqlite3 *db, WhereLevel *pLevel, Table *pTab){
     return 0;
   }
   sqlite3StrAccumInit(&txt, 0, 0, SQLITE_MAX_LENGTH);
+  txt.db = db;
   sqlite3StrAccumAppend(&txt, " (", 2);
   for(i=0; i<nEq; i++){
     explainAppendTerm(&txt, i, aCol[aiColumn[i]].zName, "=");