Remove a branch in STAT4 logic that is no longer reachable after

the previous change.

FossilOrigin-Name: eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6

diff --git a/manifest b/manifest
index 6bff4a40714101a869f03fb905be26d41ed40958..aceb0f89c8def8b5c9b0d1144d3fbb1a221a7416 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spossible\s(and\sprobably\sharmless)\suninitialized\svariable\sin\sSTAT3/4.
-D 2013-12-03T19:16:06.615
+C Remove\sa\sbranch\sin\sSTAT4\slogic\sthat\sis\sno\slonger\sreachable\safter\s\nthe\sprevious\schange.
+D 2013-12-03T19:49:55.482
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -293,7 +293,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c e9e593d5bb798c3e67fc3893dfe7055c9e7d8d74
-F src/where.c e0a9909a58eee7dcde1d1bd5cf6381b0dbc83389
+F src/where.c e6a4e713abe6f995495ea53dd6a5e48f88b53883
 F src/whereInt.h 96a75c61f1d2b9d4a8e4bb17d89deb0cf7cba358
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 14f9bc79014e5762b88b9f0b98f4d47a8092d127
-R a21a54e67ec7aa45fd701d0774acda83
+P 33ad4f91477907b7b3e5808c7ba11aacc9a83ba6
+R b9a8385eb7153992ed9d3229f4d58e8a
 U drh
-Z 49eaa17223688ae51427734254ac0a7e
+Z 1abf6c68d7a5a613f293f6a4e7a65cb6

diff --git a/manifest.uuid b/manifest.uuid
index 30347924f95ff2f6b014eb59b460ab6f36ddc975..33fe443f154dcf54841ff23ecaaf153902fc2e18 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-33ad4f91477907b7b3e5808c7ba11aacc9a83ba6
\ No newline at end of file
+eca7d3f1612c7a009a9e4ef89f76f9b7e275d1e6
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 7ec6cfaae7c290b919b2f5e52e33d5c585ec7369..7d3ec48dacd70053ac91aca565de806e9bbcf124 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1905,8 +1905,7 @@ static void whereKeyStats(
 #ifndef SQLITE_DEBUG
   UNUSED_PARAMETER( pParse );
 #endif
-  assert( pRec!=0 || pParse->db->mallocFailed );
-  if( pRec==0 ) return;
+  assert( pRec!=0 );
   iCol = pRec->nField - 1;
   assert( pIdx->nSample>0 );
   assert( pRec->nField>0 && iCol<pIdx->nSampleCol );