From: danielk1977 <danielk1977@noemail.net>
Date: Fri, 11 Apr 2008 17:15:46 +0000 (+0000)
Subject: Remove a recently added assert() that is failing with certain compilers on 32-bit... 
X-Git-Tag: version-3.6.10~1187
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ea1b3f8b968b7b18f6c3c0486407180e3de2b16;p=thirdparty%2Fsqlite.git

Remove a recently added assert() that is failing with certain compilers on 32-bit platforms. Ticket #3043. (CVS 4990)

FossilOrigin-Name: 03c0279d7b004ccc4264143e366c793b4d774f9f
---

diff --git a/manifest b/manifest
index affce2906a..19f50513a6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sentries\sfrom\sthe\ssqlite_stat1\stable\swhenever\san\sindex\sis\sdropped.\sRelated\sto\s#3033.\s(CVS\s4989)
-D 2008-04-11T17:11:27
+C Remove\sa\srecently\sadded\sassert()\sthat\sis\sfailing\swith\scertain\scompilers\son\s32-bit\splatforms.\sTicket\s#3043.\s(CVS\s4990)
+D 2008-04-11T17:15:47
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in b861627d91df5ee422c54237aa38296954dc0151
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -179,7 +179,7 @@ F src/vdbe.c 444ab9ecc91f3c04b2b29ae604458426aa674fa6
 F src/vdbe.h bfd84bda447f39cb599302c7ec85067dae20453c
 F src/vdbeInt.h 0b96efdeecb0803e504bf1c16b198f87c91d6019
 F src/vdbeapi.c ab6e99f8a6b7fcb82c2c698da7a36762a7593f0a
-F src/vdbeaux.c c44aeac1f89695720c0e0aae9aadfe74b64d23fe
+F src/vdbeaux.c f7460fac0c61d90edb245c66b7ac35254868c8e5
 F src/vdbeblob.c cc713c142c3d4952b380c98ee035f850830ddbdb
 F src/vdbefifo.c a30c237b2a3577e1415fb6e288cbb6b8ed1e5736
 F src/vdbemem.c 095e18f84b3171a5f2d71fa93a4bfc64220c1cfe
@@ -627,7 +627,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 38746c54385e3cb456cda660ea50769b5424db30
-R 9391d0fdc944a8562cddc95195f4991f
+P 349aab42c7896f04ecb6ca33f08a4c194051e837
+R 634fdd977734aaaf019f0fc0925e8ad5
 U danielk1977
-Z 00d7394476c64d4bc2a531edfc49d684
+Z 3119d76022deaffdd36833a387e7aabe
diff --git a/manifest.uuid b/manifest.uuid
index fdbab60748..74035d7954 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-349aab42c7896f04ecb6ca33f08a4c194051e837
\ No newline at end of file
+03c0279d7b004ccc4264143e366c793b4d774f9f
\ No newline at end of file
diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index af77c8df48..b6bdde47ac 100644
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2068,9 +2068,6 @@ int sqlite3VdbeSerialGet(
   u32 serial_type,              /* Serial type to deserialize */
   Mem *pMem                     /* Memory cell to write value into */
 ){
-#ifndef SQLITE_MEMORY_SIZE
-  assert( (7&(int)pMem)==0 );   /* Verify 8-byte alignment.  Ticket #3040 */
-#endif
   switch( serial_type ){
     case 10:   /* Reserved for future use */
     case 11:   /* Reserved for future use */