From: drh <drh@noemail.net>
Date: Mon, 23 Mar 2015 19:03:51 +0000 (+0000)
Subject: Fix datetype size asserts in btree.c.
X-Git-Tag: version-3.8.9~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=062cf27d0014afc0ec0b00dee2a821111a0ef121;p=thirdparty%2Fsqlite.git

Fix datetype size asserts in btree.c.

FossilOrigin-Name: ff4812d0e8e6322ca8b6992925fd4ef4aee463e6
---

diff --git a/manifest b/manifest
index 012f08e737..8ca7814754 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\sNULL\spointer\sdereference\sfollowing\sa\ssyntax\serror.
-D 2015-03-22T10:23:17.264
+C Fix\sdatetype\ssize\sasserts\sin\sbtree.c.
+D 2015-03-23T19:03:51.368
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -173,7 +173,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c ff743689c4d6c5cb55ad42ed9d174b2b3e71f1e3
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
-F src/btree.c d4d52fb14e863cff9dbc7c746e9048ec0967a555
+F src/btree.c 3e320cac836546c905bd90007074d887980aa70e
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 2bfefc01875d8da066504c233ec259fcb3b2ef72
 F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
@@ -1246,7 +1246,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 9513dbd4860c8dd391f831982d09aff227d16f5c
-R e779bfe0488c17857ae1dcf614dd348f
+P 8d27e3e16a9be79fe227e833f4770ebe09a9d90b
+R b5413ce9e25a08fe53ff3be92a646869
 U drh
-Z ca73f5b3867dd7a4dfc248e6290c5b53
+Z 5fbc203b6eb85f868f3432b74d400822
diff --git a/manifest.uuid b/manifest.uuid
index 223b936105..16d4f53715 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d27e3e16a9be79fe227e833f4770ebe09a9d90b
\ No newline at end of file
+ff4812d0e8e6322ca8b6992925fd4ef4aee463e6
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 1d82a2b625..ac0c877317 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -2017,8 +2017,8 @@ int sqlite3BtreeOpen(
     ** the right size.  This is to guard against size changes that result
     ** when compiling on a different architecture.
     */
-    assert( sizeof(i64)==8 || sizeof(i64)==4 );
-    assert( sizeof(u64)==8 || sizeof(u64)==4 );
+    assert( sizeof(i64)==8 );
+    assert( sizeof(u64)==8 );
     assert( sizeof(u32)==4 );
     assert( sizeof(u16)==2 );
     assert( sizeof(Pgno)==4 );