diff --git a/main.mk b/main.mk index c1963c0c72..dff39b67fa 100644 --- a/main.mk +++ b/main.mk @@ -261,7 +261,7 @@ opcodes.o: opcodes.c $(TCCX) -c opcodes.c opcodes.c: opcodes.h $(TOP)/mkopcodec.awk - sort -n +2 opcodes.h | awk -f $(TOP)/mkopcodec.awk >opcodes.c + sort -n -b +2 opcodes.h | awk -f $(TOP)/mkopcodec.awk >opcodes.c opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk cat parse.h $(TOP)/src/vdbe.c | awk -f $(TOP)/mkopcodeh.awk >opcodes.h diff --git a/manifest b/manifest index 4170397e1b..f0e1f571c2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C add\s--enable-debug\sto\sconfigure\soptions,\scontrols\s-DNDEBUG\sflag\s(CVS\s2178) -D 2005-01-03T21:28:57 +C Remove\sincorrect\sassert()\sand\sadd\sextra\soption\sto\saccount\sfor\snon-standard\s'sort'\sprogram\sin\ssome\slinux\sversions.\s(CVS\s2179) +D 2005-01-07T01:56:17 F Makefile.in ecf441ac5ca1ccfc8748a8a9537706e69893dfa4 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1 @@ -16,7 +16,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826 -F main.mk 41626e77ccf8ece8a3afa98e41c2fe584160e7a1 +F main.mk 962ac4f3b8ab6ce00d66f085bf259f946589eead F mkdll.sh 468d4f41d3ea98221371df4825cfbffbaac4d7e4 F mkopcodec.awk 141aede6e58634f9cf9e96205a5316680e649987 F mkopcodeh.awk ee454cdee1da38b485c5e8cca84e5727c07158ba @@ -76,7 +76,7 @@ F src/update.c 0979397c41ac29c54fe0cc687a356d8629a633af F src/utf.c e45ce11be6922408cd381561721f6cca7d3b992a F src/util.c 29f43c4a7b9ff29302f7899f793be6836b6cd7f9 F src/vacuum.c 705256e1111521fa04f0029de7f1667bc131d015 -F src/vdbe.c 40ab8e30eca1ed0e5d9e17b6d835660edf14c7c2 +F src/vdbe.c 789e3c986ff311ca371adaad24baa65e42e0b029 F src/vdbe.h 067ca8d6750ba4f69a50284765e5883dee860181 F src/vdbeInt.h 0f74561e629af86172de7cdf0ecaea014c51696c F src/vdbeapi.c 0cf3bdc1072616bedc8eec7fc22e3f5a169d33fd @@ -263,7 +263,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0 F www/whentouse.tcl c3b50d3ac31c54be2a1af9b488a89d22f1e6e746 -P 707690c5f2e1340bbbb4cb06e6b2b76a2a3b5f0d -R c4747f9d27509e44cdc259f6ea036872 -U tpoindex -Z e700f82bb149e58c89111ae44f6bd5a5 +P 9d674d1dc09f72c64ef7f37cd9838c7a9c50b746 +R d21fa91d39b388686915b90d94c4baf8 +U danielk1977 +Z d4d186f3d78d137c0d019d40b89696b1 diff --git a/manifest.uuid b/manifest.uuid index bd1f3b5bfc..593f778bb8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -9d674d1dc09f72c64ef7f37cd9838c7a9c50b746 \ No newline at end of file +bf14387697459d8d348a35ca50e2ee9407dcf1e1 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 711899e3da..e022d382d2 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id: vdbe.c,v 1.435 2004/12/25 01:03:14 drh Exp $ +** $Id: vdbe.c,v 1.436 2005/01/07 01:56:17 danielk1977 Exp $ */ #include "sqliteInt.h" #include "os.h" @@ -2553,7 +2553,6 @@ case OP_MoveGt: { *pC->pIncrKey = oc==OP_MoveGt || oc==OP_MoveLe; if( pC->intKey ){ i64 iKey; - assert( !pOp->p3 ); Integerify(pTos); iKey = intToKey(pTos->i); if( pOp->p2==0 && pOp->opcode==OP_MoveGe ){