Only do the cell overread checks in sqlite3BtreeInitPage if

SQLITE_OVERREAD_CHECK is defined at compile-time. (CVS 6733)

FossilOrigin-Name: 49f544ebae8dc3cf7cf6189536c56ebb7d258a86

diff --git a/manifest b/manifest
index 280c4449803c7a9264be1fc1fd5d84fc67484136..00072052365c547908a3f41af8a3f8144854c9c4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sclear\sthe\sMemPage.nFree\svariable\swhen\sinsertCell()\sadds\san\soverflow\scell\sto\sa\spage.\sNot\sdoing\sthis\smeans\sbalance_quick()\scan\savoid\sa\scall\sto\ssqlite3BtreeInitPage().\s(CVS\s6732)
-D 2009-06-09T09:41:00
+C Only\sdo\sthe\scell\soverread\schecks\sin\ssqlite3BtreeInitPage\sif\nSQLITE_OVERREAD_CHECK\sis\sdefined\sat\scompile-time.\s(CVS\s6733)
+D 2009-06-09T10:37:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -106,7 +106,7 @@ F src/auth.c 98db07c2088455797678eb1031f42d4d94d18a71
 F src/backup.c ff50af53184a5fd7bdee4d620b5dabef74717c79
 F src/bitvec.c 0ef0651714728055d43de7a4cdd95e703fac0119
 F src/btmutex.c 9b899c0d8df3bd68f527b0afe03088321b696d3c
-F src/btree.c 53c5df7ff0df6b3d089d1f93888c85195e3fd367
+F src/btree.c 30bd9f07840eb40bb7e84718ef222e0d2dabb4a4
 F src/btree.h f70b694e8c163227369a66863b01fbff9009f323
 F src/btreeInt.h df64030d632f8c8ac217ed52e8b6b3eacacb33a5
 F src/build.c 20e02fd72249159ff6829009f3029d16d59cdff5
@@ -733,7 +733,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P cc9c12170c3f6f0f485977e47e7fbb75c50e82b1
-R d036fc96778854a1f95e2dd9e0b87a34
-U danielk1977
-Z ee3eb7d6cafebd45a9fd708a20a004b3
+P 8f1c1f61f7bc5270212725cf0a056872df983f49
+R 23881bef89b48856953f16ab4fcdd93d
+U drh
+Z a11e1844a1e55425522b632316002079

diff --git a/manifest.uuid b/manifest.uuid
index 571c8c50c9d804d01640a30836d65c6a6735bb39..01e1ca667264b52fcee7e4993d693045f8995a89 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f1c1f61f7bc5270212725cf0a056872df983f49
\ No newline at end of file
+49f544ebae8dc3cf7cf6189536c56ebb7d258a86
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 218f23f8a70b4e34bd07f235578d15c1ff0777e6..c35d2902df11b28267f95eb2e7933c76c86a1efe 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
 **    May you share freely, never taking more than you give.
 **
 *************************************************************************
-** $Id: btree.c,v 1.621 2009/06/09 09:41:00 danielk1977 Exp $
+** $Id: btree.c,v 1.622 2009/06/09 10:37:04 drh Exp $
 **
 ** This file implements a external (disk-based) database using BTrees.
 ** See the header comment on "btreeInt.h" for additional information.
@@ -1153,7 +1153,7 @@ int sqlite3BtreeInitPage(MemPage *pPage){
     ** past the end of a page boundary and causes SQLITE_CORRUPT to be 
     ** returned if it does.
     */
-#if defined(SQLITE_OVERREAD_CHECK) || 1
+#if defined(SQLITE_OVERREAD_CHECK)
     {
       int iCellFirst;   /* First allowable cell index */
       int iCellLast;    /* Last possible cell index */