From: drh Date: Wed, 11 Nov 2009 23:58:06 +0000 (+0000) Subject: If the sector size is unspecified (initially 0) then set it to 512, not to 32. X-Git-Tag: fts3-refactor~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae2a348dbd827de9eb572561c110706c4db5d5fe;p=thirdparty%2Fsqlite.git If the sector size is unspecified (initially 0) then set it to 512, not to 32. FossilOrigin-Name: 8861b5c16031ad570ffbe17b3ec8163b136a7f63 --- diff --git a/manifest b/manifest index e486459505..3154532172 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Remove\san\sobsolete\s(and\sincorrect)\scomment\sfrom\ssqlite3MemCompare().\nNo\schanges\sto\scode. -D 2009-11-11T23:48:23 +C If\sthe\ssector\ssize\sis\sunspecified\s(initially\s0)\sthen\sset\sit\sto\s512,\snot\sto\s32. +D 2009-11-11T23:58:06 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -151,7 +151,7 @@ F src/os_common.h 240c88b163b02c21a9f21f87d49678a0aa21ff30 F src/os_os2.c 75a8c7b9a00a2cf1a65f9fa4afbc27d46634bb2f F src/os_unix.c bdd6ca0932dcb51c344081aff430bcc71c14db7f F src/os_win.c 5ffab20249a61e0625f869efe157fa009747039b -F src/pager.c f7d645a831cbca683bbf9f7d55ca7bd191223ce0 +F src/pager.c 47343e340df799199fd1f1a184f0df8861519e1e F src/pager.h 1b32faf2e578ac3e7bcf9c9d11217128261c5c54 F src/parse.y 0a36c62c090e7e5bb2e36f66909cf4a42c025e1b F src/pcache.c 3b079306376e0e04c0d3df40c0a4b750a1839310 @@ -770,14 +770,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 5a474a867c5988ad5ec03719516fdd38f0da5c2c -R 6b8011eb59ad06eaa71c5080dbc1e3ad +P c15b70b3aefc399dae1df5bb721530f0e2b7887a +R b90b93f7f854c88da1f9a6b1e74b502b U drh -Z c11349881589164a7397232cea14bf4f +Z 4327ac2d667e56f35ffb44f65d860347 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFK+01KoxKgR168RlERAvweAKCIKBWG5Y6Iox8nOEQOxXgg8IKh8ACgiK1Z -zoZVc9Y0y/49kktgPBiWr4k= -=e4PZ +iD8DBQFK+0+UoxKgR168RlERAjjgAJ9jNmLhWxJ4mrPtF8QZQyv008kPpwCghE2/ +IbgAg0OFaYa8g8Ax0ACWJdI= +=RCGh -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 833ac90eb3..4fb4aabfde 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c15b70b3aefc399dae1df5bb721530f0e2b7887a \ No newline at end of file +8861b5c16031ad570ffbe17b3ec8163b136a7f63 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 85a99a11a6..f2099c4c72 100644 --- a/src/pager.c +++ b/src/pager.c @@ -1794,7 +1794,7 @@ static void setSectorSize(Pager *pPager){ pPager->sectorSize = sqlite3OsSectorSize(pPager->fd); } if( pPager->sectorSize<32 ){ - pPager->sectorSize = 32; + pPager->sectorSize = 512; } if( pPager->sectorSize>MAX_SECTOR_SIZE ){ assert( MAX_SECTOR_SIZE>=512 );