Change an unreachable error condition test to an assert() in rowset.c. (CVS 6429)

FossilOrigin-Name: 36115e4073528f03253dd94fadf3954522c0dfb9

diff --git a/manifest b/manifest
index 5152717dc3f2de95212c6a6a9de14f9c6cf309cf..6e7dd29dabf25216e165fb8c1dd6b1eeacb4b44a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunreachable\sbranch\sfrom\slockBtree().\sAdd\scomments.\s(CVS\s6428)
-D 2009-04-01T19:07:04
+C Change\san\sunreachable\serror\scondition\stest\sto\san\sassert()\sin\srowset.c.\s(CVS\s6429)
+D 2009-04-01T19:35:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -154,7 +154,7 @@ F src/prepare.c aa3e7dc01a011269b9152e5103fad2eea2c96e7a
 F src/printf.c 9866a9a9c4a90f6d4147407f373df3fd5d5f9b6f
 F src/random.c 676b9d7ac820fe81e6fb2394ac8c10cff7f38628
 F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d
-F src/rowset.c ba9375f37053d422dd76965a9c370a13b6e1aac4
+F src/rowset.c badb9f36b3a2ced9ee9551f4ce730f5fab442791
 F src/select.c bd494b68a54a51de3df94ecdd6d24fa7598929d1
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
 F src/sqlite.h.in 0db1e59d89aeacb8fe64a19fd14c13a796060ccb
@@ -714,7 +714,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 766bb7e59c28884e40ce13e3fc55c870d06d7e34
-R 3a6094ea8b9dd0c5d4c7f018f1b56432
-U danielk1977
-Z 51aefb40d1f48fec12c4fcbcd1a2197b
+P 859792958b4d4a3623d68526ff773f778bdf3f0d
+R ee5893a284b1dfffd70d7e1715a343a4
+U drh
+Z 76cdfb7f19847a2c25df1f69a8945188

diff --git a/manifest.uuid b/manifest.uuid
index 164ad3198d5df52e5aa431bb6e4df2474ad12e2c..43f538bc6958a51416dd959bf5cac363aa8c7ce1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-859792958b4d4a3623d68526ff773f778bdf3f0d
\ No newline at end of file
+36115e4073528f03253dd94fadf3954522c0dfb9
\ No newline at end of file

diff --git a/src/rowset.c b/src/rowset.c
index 08ac49294c29b5acc42d2ace2f953a63b3f010c4..e8f7a52e4a50ccb38e80c4084b66f2fec2226785 100644 (file)
--- a/src/rowset.c
+++ b/src/rowset.c
@@ -25,7 +25,7 @@
 ** Big chunks of rowid/next-ptr pairs are allocated at a time, to
 ** reduce the malloc overhead.
 **
-** $Id: rowset.c,v 1.3 2009/01/13 20:14:16 drh Exp $
+** $Id: rowset.c,v 1.4 2009/04/01 19:35:55 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -120,7 +120,7 @@ void sqlite3RowSetClear(RowSet *p){
 void sqlite3RowSetInsert(RowSet *p, i64 rowid){
   struct RowSetEntry *pEntry;
   struct RowSetEntry *pLast;
-  if( p==0 ) return;  /* Must have been a malloc failure */
+  assert( p!=0 );
   if( p->nFresh==0 ){
     struct RowSetChunk *pNew;
     pNew = sqlite3DbMallocRaw(p->db, sizeof(*pNew));