From 359a8f80f141eb0056a6430bdddcafbcbf8edc89 Mon Sep 17 00:00:00 2001 From: shane Date: Tue, 7 Oct 2008 01:18:59 +0000 Subject: [PATCH] Removed redundant assert(). (CVS 5773) FossilOrigin-Name: 486b1124f76bcf0505b6be908f2a3e988ad6e05d --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/select.c | 3 +-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 83c4ba23ff..b623ff1b3d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Allow\sINDEXED\sBY\sand\sNOT\sINDEXED\sto\sbe\sused\sin\sUPDATE\sand\sDELETE\sstatements.\s(CVS\s5772) -D 2008-10-06T16:18:40 +C Removed\sredundant\sassert().\s(CVS\s5773) +D 2008-10-07T01:18:59 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -147,7 +147,7 @@ F src/prepare.c c7e00ed1b0bdcf699b1aad651247d4dc3d281b0b F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d F src/random.c 11bbdf7def3746a762fbdb56c9d04648135ad6d8 F src/resolve.c 1971ff6996f1a73303339acf7f1de8497546045d -F src/select.c 34f32ee034289d72aa459fef40565bb74c76af24 +F src/select.c c1c555ee714c61db92b2688b307a0145d7405122 F src/shell.c d83b578a8ccdd3e0e7fef4388a0887ce9f810967 F src/sqlite.h.in ea235b37a691b32e7941baa70fb0afaf6377dbb4 F src/sqlite3ext.h 1e3887c9bd3ae66cb599e922824b04cd0d0f2c3e @@ -640,7 +640,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P c3cf54a1b6bbaaeab4cab701c6cbbed02695facc -R ca83b644149fe533cdd795f52e48a148 -U danielk1977 -Z c3b964ea90e3130652cb73cc4202d059 +P 83a7e446b2d4846a6f92bd831a2adaa265f5a786 +R aa8a31d65cc954485c711dc29b6f394a +U shane +Z 0e61cf018a940fb3ad2af57c9790cf1b diff --git a/manifest.uuid b/manifest.uuid index 2d94ee7748..36cf0b69e7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -83a7e446b2d4846a6f92bd831a2adaa265f5a786 \ No newline at end of file +486b1124f76bcf0505b6be908f2a3e988ad6e05d \ No newline at end of file diff --git a/src/select.c b/src/select.c index 9e57fd9d25..5d8171e860 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.478 2008/10/06 16:18:40 danielk1977 Exp $ +** $Id: select.c,v 1.479 2008/10/07 01:18:59 shane Exp $ */ #include "sqliteInt.h" @@ -81,7 +81,6 @@ Select *sqlite3SelectNew( pNew->pOrderBy = pOrderBy; pNew->selFlags = isDistinct ? SF_Distinct : 0; pNew->op = TK_SELECT; - assert( pOffset==0 || pLimit!=0 ); pNew->pLimit = pLimit; pNew->pOffset = pOffset; pNew->addrOpenEphm[0] = -1; -- 2.47.2