From: drh Date: Mon, 27 Jun 2011 23:32:35 +0000 (+0000) Subject: Create a branch that contains just the fix for the case_sensitive_like X-Git-Tag: version-3.7.7.1~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0afb86de3900a4116a7ebd227a11a140a9db891;p=thirdparty%2Fsqlite.git Create a branch that contains just the fix for the case_sensitive_like pragma bug, ticket [25ee81271091ec]. FossilOrigin-Name: ec8f23fc042ad8d700abe38a98c2baea02db1176 --- diff --git a/manifest b/manifest index 6afb8c5324..da1e73126b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Version\s3.7.7\srelease\scandidate\s#1. -D 2011-06-23T19:49:22.376 +C Create\sa\sbranch\sthat\scontains\sjust\sthe\sfix\sfor\sthe\scase_sensitive_like\npragma\sbug,\sticket\s[25ee81271091ec]. +D 2011-06-27T23:32:35.931 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -242,7 +242,7 @@ F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1 F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45 F src/vdbeapi.c 2f908c65337b16c6249ab378d477e74492cf759b -F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21 +F src/vdbeaux.c 4d100407e3c72e163854aff8903d19d5ecdf46c0 F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114 @@ -949,7 +949,11 @@ F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00 F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d -P b61a76a53af04f731fe7617f7b6b4fb2aef6587b -R 5805b6f3882ce897a61c4ce87076bc70 +P 4374b7e83ea0a3fbc3691f9c0c936272862f32f2 +R f6b60276b07542bae374240206d06fc4 +T *bgcolor * #80bbd6 +T *branch * branch-3.7.7 +T *sym-branch-3.7.7 * +T -sym-trunk * U drh -Z a111ec09c232c3c09811b275ae45bf17 +Z 5152c36779edaf261ff98a6334f3e894 diff --git a/manifest.uuid b/manifest.uuid index 1781623b8d..3705958206 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4374b7e83ea0a3fbc3691f9c0c936272862f32f2 \ No newline at end of file +ec8f23fc042ad8d700abe38a98c2baea02db1176 \ No newline at end of file diff --git a/src/vdbeaux.c b/src/vdbeaux.c index 447ba57a1e..989a8003d3 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -1505,6 +1505,7 @@ void sqlite3VdbeMakeReady( memset(zCsr, 0, zEnd-zCsr); zCsr += (zCsr - (u8*)0)&7; assert( EIGHT_BYTE_ALIGNMENT(zCsr) ); + p->expired = 0; /* Memory for registers, parameters, cursor, etc, is allocated in two ** passes. On the first pass, we try to reuse unused space at the