From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 11 May 2004 03:11:22 +0000 (+0000)
Subject: Internal symbols MEM_Dyn and MEM_AggCtx were defined as the same bit pattern.
X-Git-Tag: version-3.0.0~264
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=643631771d5debba86a4ccbfc265f44c66a28b34;p=thirdparty%2Fsqlite.git

Internal symbols MEM_Dyn and MEM_AggCtx were defined as the same bit pattern.
Change MEM_AggCtx to 0x1000. (CVS 1350)

FossilOrigin-Name: 2fffd133a5e0058f02c20c498875093261e9ee19
---

diff --git a/manifest b/manifest
index 666b01867d..da476388fc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\sbtree\scode\sfor\sreading\svarints\sgreater\sthan\s2^32.\s(CVS\s1349)
-D 2004-05-11T02:10:07
+C Internal\ssymbols\sMEM_Dyn\sand\sMEM_AggCtx\swere\sdefined\sas\sthe\ssame\sbit\spattern.\r\nChange\sMEM_AggCtx\sto\s0x1000.\s(CVS\s1350)
+D 2004-05-11T03:11:22
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -65,7 +65,7 @@ F src/util.c 74ee316594f68c41aed1884d737ab4085d479455
 F src/vacuum.c c134702e023db8778e6be59ac0ea7b02315b5476
 F src/vdbe.c f2094463b65008ff5b21efb8fa9488166708415f
 F src/vdbe.h 2dc4d1161b64f5684faa6a2d292e318a185ecb2e
-F src/vdbeInt.h d5786e1c4f7dadac24e3baeed9847dbfed3016de
+F src/vdbeInt.h ff85e432a43eb7533b17c9cece2baaf813ba8711
 F src/vdbeaux.c 7162f1390620257e25070da1ac2b4ec83e472752
 F src/where.c 487e55b1f64c8fbf0f46a9a90c2247fc45ae6a9a
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P e6e52fc2e62835712d6b92a19fdbd2ba15b2e9cd
-R eddbe501e85ee40d9b6f98dd3f3ed5da
+P 7bc4f5543fbfa9f3fe6e9479a1f85fbaf6c95af4
+R a586015bc362ba74ddb676fd35378098
 U danielk1977
-Z 09a8cec2758d5fe1ed56a8565010b716
+Z 6aa192c3ea0001cf7f147266d1b89473
diff --git a/manifest.uuid b/manifest.uuid
index 1da647e4fe..ee07202675 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7bc4f5543fbfa9f3fe6e9479a1f85fbaf6c95af4
\ No newline at end of file
+2fffd133a5e0058f02c20c498875093261e9ee19
\ No newline at end of file
diff --git a/src/vdbeInt.h b/src/vdbeInt.h
index 2e52ce9a8a..f250a1adc3 100644
--- a/src/vdbeInt.h
+++ b/src/vdbeInt.h
@@ -151,7 +151,7 @@ typedef struct Mem Mem;
 ** It indicates that the corresponding AggElem.aMem.z points to a
 ** aggregate function context that needs to be finalized.
 */
-#define MEM_AggCtx    0x0100   /* Mem.z points to an agg function context */
+#define MEM_AggCtx    0x1000   /* Mem.z points to an agg function context */
 
 /*
 ** The "context" argument for a installable function.  A pointer to an