Reduce the maximum supported sector size to 64KiB. (CVS 6970)

FossilOrigin-Name: 8e1e0ba292150f8968e5295e8ba9cd7360b6a64b

diff --git a/manifest b/manifest
index 15c0fe80457ea528374bbf12e1481c15ef0191fd..fa0c2e3bde7e416901ee2f96e0754aa80fb45ce7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.6.17\s(CVS\s6969)
-D 2009-08-10T15:16:27
+C Reduce\sthe\smaximum\ssupported\ssector\ssize\sto\s64KiB.\s(CVS\s6970)
+D 2009-08-10T17:48:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
 F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
 F src/os_win.c 79bb3c59d60bc6faadd379cf036c132fa545d7d6
-F src/pager.c 4aa16cc8bc8e4b0b457fb3ddb600970381b2be7d
+F src/pager.c a47be286477ed6c7b9a342dd53d4e4043f29d8c2
 F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
 F src/parse.y 6c42631e72a3d14cde2bee85e79409066066d3df
 F src/pcache.c c92ffd4f3e1279b3766854c6d18b5bf4aac0d1fa
@@ -741,7 +741,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 3172a296926c6b50af5b6edfe38013056e155fa0
-R 0550a36def123768957593cd7b73b730
+P 36650102285ef9663853cacd5daf8dd6d7cf418f
+R cfef2a17eaf9c7d1135074826e78bc07
 U drh
-Z c389e7f8b14bf8d887863c9f564cd08c
+Z df8e14bf7b01e354a5a71869750fff56

diff --git a/manifest.uuid b/manifest.uuid
index 6713b28bda7f2de53948dcbd80170043f752d52e..3606b84603ac4041c0fdda5c20271d58b5f3c8ba 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-36650102285ef9663853cacd5daf8dd6d7cf418f
\ No newline at end of file
+8e1e0ba292150f8968e5295e8ba9cd7360b6a64b
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index fe3248cbf972d55f8c495aeb804b311012aeb472..abde57adf4164a54903bdbf86e77fe1baa84d540 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.628 2009/07/27 14:15:44 danielk1977 Exp $
+** @(#) $Id: pager.c,v 1.629 2009/08/10 17:48:57 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -114,12 +114,12 @@ int sqlite3PagerTrace=1;  /* True to enable tracing */
 #endif
 
 /*
-** The maximum allowed sector size. 16MB. If the xSectorsize() method 
+** The maximum allowed sector size. 64KiB. If the xSectorsize() method 
 ** returns a value larger than this, then MAX_SECTOR_SIZE is used instead.
 ** This could conceivably cause corruption following a power failure on
 ** such a system. This is currently an undocumented limit.
 */
-#define MAX_SECTOR_SIZE 0x0100000
+#define MAX_SECTOR_SIZE 0x10000
 
 /*
 ** An instance of the following structure is allocated for each active