From: mistachkin Date: Thu, 29 Jun 2017 15:57:42 +0000 (+0000) Subject: Correct typo in the Win32 interface for lsm1. X-Git-Tag: version-3.20.0~158 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2586f77ad5c9884919d7622321ce8c0807fe4f5;p=thirdparty%2Fsqlite.git Correct typo in the Win32 interface for lsm1. FossilOrigin-Name: 1b4facb1ad0085aa52e63d4d432179467ddc2a69b668d49d86e65ead66a73f57 --- diff --git a/ext/lsm1/lsm_win32.c b/ext/lsm1/lsm_win32.c index 75e07c5643..5d54712094 100644 --- a/ext/lsm1/lsm_win32.c +++ b/ext/lsm1/lsm_win32.c @@ -703,7 +703,8 @@ int lsmWin32OsShmMap(lsm_file *pFile, int iChunk, int sz, void **ppShm){ if( pWin32File->apShm[iChunk]==NULL ){ LPVOID pMap; pMap = MapViewOfFile(pWin32File->ahShm[iChunk], - FILE_MAP_WRITE | FILE_MAP_READ, 0, 0, (SIZE_T)sz); + FILE_MAP_WRITE | FILE_MAP_READ, 0, (DWORD)(iChunk*sz), + (SIZE_T)sz); if( pMap==NULL ){ return LSM_IOERR_BKPT; } diff --git a/manifest b/manifest index 5dfedc859c..283b43c411 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sinterfaces\ssqlite3_prepare_v3()\sand\ssqlite3_prepare16_v3()\swith\sthe\s\nextra\sprepFlags\sargument.\sAdd\sthe\sSQLITE_PREPARE_PERSISTENT\soption\sas\s\none\sbit\sin\sthat\sargument.\s\sUse\sthe\snew\soption\sin\sFTS3,\sFTS5,\sand\sRTREE. -D 2017-06-29T15:24:57.455 +C Correct\stypo\sin\sthe\sWin32\sinterface\sfor\slsm1. +D 2017-06-29T15:57:42.733 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a @@ -250,7 +250,7 @@ F ext/lsm1/lsm_tree.c 5d9fb2bc58a1a70c75126bd8d7198f7b627e165b F ext/lsm1/lsm_unix.c ee0201dff10ce2008ef13a65f52a6ea348f287e795270f651596f812fcfccdcc F ext/lsm1/lsm_varint.c b19ae9bd26b5a1e8402fb8a564b25d9542338a41 F ext/lsm1/lsm_vtab.c fff303ce03168eca9e333add3c1429b3471674b0 -F ext/lsm1/lsm_win32.c 385e85a38dd0f2d7c9d0ca9336b891a92765765aaa769d577673cac7ffe96fd7 +F ext/lsm1/lsm_win32.c a8778d33353fe1bc2c36ca55b66a44bd622a81132e29ff757ec356a9e612918d F ext/misc/README.md 8e008c8d2b02e09096b31dfba033253ac27c6c06a18aa5826e299fa7601d90b2 F ext/misc/amatch.c 6db4607cb17c54b853a2d7c7c36046d004853f65b9b733e6f019d543d5dfae87 F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a22525eddb @@ -1627,8 +1627,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 4df6e2476ce93b9ca7a6959c8c2d6ef2c30395984b007d74166031dcf09d54b4 62b8269ba2ff71e2daaa86688698896badd6f6e34ab42fbf92dda7fcda73a230 -R cad4927ca13ab606926228f90825f496 -T +closed 62b8269ba2ff71e2daaa86688698896badd6f6e34ab42fbf92dda7fcda73a230 -U drh -Z c711a468c88b761fff1a0b845cf3a6be +P 03977248e6fdaa9b35c15e5dd9bb89552f2f0a913cc31609b5af1e2347b67d38 +R 79b84f9a8519664e4d7f0ed69702a134 +U mistachkin +Z fcbc14d99bbb3aa5af7edd91ba2de7eb diff --git a/manifest.uuid b/manifest.uuid index 9d2a38e5fb..ee3b185480 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -03977248e6fdaa9b35c15e5dd9bb89552f2f0a913cc31609b5af1e2347b67d38 \ No newline at end of file +1b4facb1ad0085aa52e63d4d432179467ddc2a69b668d49d86e65ead66a73f57 \ No newline at end of file