From: drh Date: Fri, 16 Sep 2005 02:48:01 +0000 (+0000) Subject: Undo check-in (2694). (CVS 2697) X-Git-Tag: version-3.6.10~3462 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=688c9f062289516e0e74729cc4288a41370f2514;p=thirdparty%2Fsqlite.git Undo check-in (2694). (CVS 2697) FossilOrigin-Name: 6017b1962517eb206183042bbb718925d9819063 --- diff --git a/manifest b/manifest index d1beaa67d4..742700b2de 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\swhole\shost\sof\snewly\sdiscovered\smemory\sleaks\sthe\soccur\safter\sa\nfailure\sof\srealloc().\s(CVS\s2696) -D 2005-09-16T02:38:10 +C Undo\scheck-in\s(2694).\s(CVS\s2697) +D 2005-09-16T02:48:02 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -34,7 +34,7 @@ F src/attach.c 4b21689700a72ae281fa85dbaff06b2a62bd49ee F src/auth.c 31e2304bef67f44d635655f44234387ea7d21454 F src/btree.c a1ee183067f20eb5ba33ca45ed47acbc7214fe44 F src/btree.h 1ed561263ca0e335bc3e81d761c9d5ff8c22f61e -F src/build.c 62a286c8b1f4084a5e5abb0e3bd5434444c08de6 +F src/build.c 74653e045581bfbadb8b35a0cb38a62f4a2c850e F src/callback.c 9a1162c8f9dae9fad6d548339669aacb5f6cf76b F src/complete.c 4de937dfdd4c79a501772ab2035b26082f337a79 F src/date.c 7444b0900a28da77e57e3337a636873cff0ae940 @@ -307,7 +307,7 @@ F www/tclsqlite.tcl ddcf912ea48695603c8ed7efb29f0812ef8d1b49 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 -P 714254cbc12564d44548707043fdcdffb17e4fde -R 573a33c72d8fc43cba95874908d9610d +P 4686d649756a0aa301ade901ac49c89a976c5402 +R f76a0ca59ea02257d83a41f08aab1ddd U drh -Z 49780202b1950719dafef774b50bb8e6 +Z 9513b9ae9fcc28a79e9a6f733a8edc5c diff --git a/manifest.uuid b/manifest.uuid index 34006565a8..c913b58561 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4686d649756a0aa301ade901ac49c89a976c5402 \ No newline at end of file +6017b1962517eb206183042bbb718925d9819063 \ No newline at end of file diff --git a/src/build.c b/src/build.c index bc3f1584f2..117bdff631 100644 --- a/src/build.c +++ b/src/build.c @@ -22,7 +22,7 @@ ** COMMIT ** ROLLBACK ** -** $Id: build.c,v 1.349 2005/09/15 21:24:52 drh Exp $ +** $Id: build.c,v 1.350 2005/09/16 02:48:02 drh Exp $ */ #include "sqliteInt.h" #include @@ -1016,7 +1016,7 @@ void sqlite3AddPrimaryKey( } } if( iColnCol ){ - pTab->aCol[iCol].isPrimKey = i<255 ? i+1 : 255; + pTab->aCol[iCol].isPrimKey = 1; } } if( pList->nExpr>1 ) iCol = -1;