From: drh <drh@noemail.net>
Date: Sat, 23 Jan 2016 14:05:27 +0000 (+0000)
Subject: Remove an assert() that can be false if compiled with SQLITE_USE_ALLOCA.
X-Git-Tag: version-3.11.0~101
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c615097d3d9140f9ea2d23faf2dd4ed58475a6ad;p=thirdparty%2Fsqlite.git

Remove an assert() that can be false if compiled with SQLITE_USE_ALLOCA.

FossilOrigin-Name: f0a551edf87ef061deae34d88b02c3b484ae9adc
---

diff --git a/manifest b/manifest
index 61cf5d66ed..7b54ea0ab0 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\swork\son\sthe\sMSVC\sbuild.
-D 2016-01-23T00:07:51.151
+C Remove\san\sassert()\sthat\scan\sbe\sfalse\sif\scompiled\swith\sSQLITE_USE_ALLOCA.
+D 2016-01-23T14:05:27.109
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1708a78eda223b6daa302b140037fcc214a779f9
@@ -340,7 +340,7 @@ F src/pcache.h 4d0ccaad264d360981ec5e6a2b596d6e85242545
 F src/pcache1.c 72f644dc9e1468c72922eff5904048427b817051
 F src/pragma.c ea290193369faa0a26ae2f924e7b86289b4a7987
 F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c
-F src/prepare.c 74855ddbdfad6a1c4a4d5c4b0913ebb01174ba19
+F src/prepare.c 8ca7237428f372a04717d558555ea67ee1c5df93
 F src/printf.c af589a27b7d40f6f4f704e9eea99f02f18ad6d32
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 9f7ce3a3c087afb7597b7c916c99126ff3f12f0c
@@ -1419,7 +1419,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a1c8116ced62d81f3f5ca26bbe0877e829d4cc56
-R b34246fa017fc0ae2e7bf7cb484e3eeb
-U mistachkin
-Z ba075ff448ff99fa520b3503324fe6e9
+P a79c46bc61a35edbaf6112c26e8052314b0eb16a
+R 78c84a447f1adb3672b2aa032cc33ea6
+U drh
+Z 2d3baf83036e6553ecd28fa4c13c4bc2
diff --git a/manifest.uuid b/manifest.uuid
index d1ea2b33a4..d11f7b73ef 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a79c46bc61a35edbaf6112c26e8052314b0eb16a
\ No newline at end of file
+f0a551edf87ef061deae34d88b02c3b484ae9adc
\ No newline at end of file
diff --git a/src/prepare.c b/src/prepare.c
index acc70dd2d5..acd50fcaf7 100644
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -525,7 +525,7 @@ static int sqlite3Prepare(
   }
   pParse->pReprepare = pReprepare;
   assert( ppStmt && *ppStmt==0 );
-  assert( !db->mallocFailed );
+  /* assert( !db->mallocFailed ); // not true with SQLITE_USE_ALLOCA */
   assert( sqlite3_mutex_held(db->mutex) );
 
   /* Check to verify that it is possible to get a read lock on all