From: adam <adam@noemail.net>
Date: Mon, 2 Apr 2012 23:42:48 +0000 (+0000)
Subject: bad assert
X-Git-Tag: mountain-lion~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4678255c4e67bfd2727f46d2c4f8636e599b1ee9;p=thirdparty%2Fsqlite.git

bad assert

FossilOrigin-Name: 0c0150f2a349460d685e63be1a747d2bfbe5c8c4
---

diff --git a/manifest b/manifest
index 4d56e8f74c..13f51b9b62 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sin\slatest\schanges,\sautologging\soptions,\sread\sonly\sfile\ssystem\swal\ssupport,\stest\sconfig\sconditionalization,\sWAL\sframe\swrite\sprebuffering
-D 2012-04-02T23:35:45.151
+C bad\sassert
+D 2012-04-02T23:42:48.936
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7bd2fa7753fc9de38994b8d4fa7f10deb19966a5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -255,7 +255,7 @@ F src/vdbemem.c fb0ac964ccbcd94f595eb993c05bfd9c52468a4a
 F src/vdbesort.c b25814d385895544ebc8118245c8311ded7f81c9
 F src/vdbetrace.c 2405f68d14c49d2e0a798d71e35d62b8569bfb65
 F src/vtab.c ab90fb600a3f5e4b7c48d22a4cdb2d6b23239847
-F src/wal.c c13ee6f76871d33a2c33be3959d2281a77233a53
+F src/wal.c b5ba968e7d5a17f745b78b3acde2214ec985d21e
 F src/wal.h a8ade3069ab75e3c79e9ca067a5ac7e1dbaf93a6
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 2112422a404dcca5d47f6630bdf180bccd36c62b
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 18ec60cacd37a70d598ac1af5e50faffa73bb134
-R 73390db6e66a079b7d6e56cc27ecf8d0
+P d51c086e5c006821e2ab932f229649a729d914b2
+R 59c782263b21a57e0518ee90df49c70e
 U adam
-Z d6996fec7b0aa226442af546de346566
+Z ad124cf32597d65682c21902b1691c73
diff --git a/manifest.uuid b/manifest.uuid
index 3f2eba4ec3..85fb1b64d4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d51c086e5c006821e2ab932f229649a729d914b2
\ No newline at end of file
+0c0150f2a349460d685e63be1a747d2bfbe5c8c4
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index d2addb7575..18903bf643 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -2702,7 +2702,6 @@ static int walWriteOneFrame(
 #if defined(SQLITE_WRITE_WALFRAME_PREBUFFERED)
   void *aFrame;
 
-  assert(sizeof(p->aFrameBuf) == (p->szPage + WAL_FRAME_HDRSIZE));
   aFrame = p->aFrameBuf;
 #else
   u8 aFrame[WAL_FRAME_HDRSIZE];   /* Buffer to assemble frame-header in */