From: drh Date: Wed, 28 Aug 2013 18:18:12 +0000 (+0000) Subject: Add the win32-longpath VFS allowing windows filenames up to 32K characters in X-Git-Tag: version-3.8.1~122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e4f9b9b7c0245818bd1e227950209305a7d2f9e2;p=thirdparty%2Fsqlite.git Add the win32-longpath VFS allowing windows filenames up to 32K characters in length. Remove unused code when -DSQLITE_MAX_MMAP_SIZE=0. Fix some compiler warnings on windows. FossilOrigin-Name: 12d0a8859de0a9d823997cfeccc77bd572cb6d13 --- e4f9b9b7c0245818bd1e227950209305a7d2f9e2 diff --cc configure index 046cbcd5ec,ca2188ee9d..57546c1a58 --- a/configure +++ b/configure @@@ -3733,13 -3732,13 +3732,13 @@@ if test "${lt_cv_nm_interface+set}" = s else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:3736: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:3735: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 -- (eval echo "\"\$as_me:3739: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:3738: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 -- (eval echo "\"\$as_me:3742: output\"" >&5) ++ (eval echo "\"\$as_me:3741: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@@ -4961,7 -4960,7 +4960,7 @@@ ia64-*-hpux* ;; *-*-irix6*) # Find out which ABI we are using. -- echo '#line 4964 "configure"' > conftest.$ac_ext ++ echo '#line 4963 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@@ -6830,11 -6829,11 +6829,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:6833: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6832: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:6837: \$? = $ac_status" >&5 ++ echo "$as_me:6836: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -7169,11 -7168,11 +7168,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7172: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7171: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 -- echo "$as_me:7176: \$? = $ac_status" >&5 ++ echo "$as_me:7175: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@@ -7274,11 -7273,11 +7273,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7277: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7276: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:7281: \$? = $ac_status" >&5 ++ echo "$as_me:7280: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -7329,11 -7328,11 +7328,11 @@@ els -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:7332: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7331: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 -- echo "$as_me:7336: \$? = $ac_status" >&5 ++ echo "$as_me:7335: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@@ -10142,7 -10141,7 +10141,7 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10145 "configure" ++#line 10144 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@@ -10238,7 -10237,7 +10237,7 @@@ els lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 10241 "configure" ++#line 10240 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@@ -12736,7 -12726,7 +12726,6 @@@ f -- ########## # Figure out all the parameters needed to compile against Tcl. # diff --cc manifest index 8c58e2adb7,74f2145549..511e1108fe --- a/manifest +++ b/manifest @@@ -1,5 -1,5 +1,5 @@@ - C In\sthe\squery\soptimizer,\swhen\sconverting\sBETWEEN\sand\sLIKE/GLOB\sexpressions\ninto\ssimpler\sforms\sfor\sprocessing,\sbe\ssure\sto\stransfer\sthe\sLEFT\sJOIN\smarkings.\nFix\sfor\sticket\s[bc878246eafe0f52c]. - D 2013-08-28T16:27:01.576 -C Update\slist\sof\ssupported\sTcl\sshells\sto\sinclude\s8.6.\s\sRemove\sstray\sOS2\sreferences. -D 2013-08-28T18:06:26.411 ++C Add\sthe\swin32-longpath\sVFS\sallowing\swindows\sfilenames\sup\sto\s32K\scharacters\sin\nlength.\s\sRemove\sunused\scode\swhen\s-DSQLITE_MAX_MMAP_SIZE=0.\s\sFix\ssome\ncompiler\swarnings\son\swindows. ++D 2013-08-28T18:18:12.076 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@@ -38,8 -38,8 +38,8 @@@ F autoconf/tea/win/rules.vc c511f222b80 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 - F configure 911d9281dfc2c862d0af9089686ec57ea9414c7b x - F configure.ac 81c43d151d0b0e406be056394cc9ff4cb3fd0444 -F configure af1a47c2c0d019462888cc6e55b387c2ca9b14f8 x ++F configure d9bb8485d40dd905e09c895692a0699628abace8 x + F configure.ac 4cf9f60785143fa141b10962ccc885d973792e9a F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710 @@@ -163,19 -163,19 +163,19 @@@ F src/auth.c 523da7fb4979469955d822ff92 F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c b7cbb0bcc61cbf1e0ed3cfcc79ee12ffcf4f469e +F src/btree.c b9b57df546df2636294bfb21a986f5707b417df2 F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf F src/btreeInt.h 51cf220a9b9223354770883e93a859dc377aa27f -F src/build.c f99a715ff9290996b579d5e1ec8e94239dc9ae5e +F src/build.c f63e8929c7f89c0074fbc74929bc946ea117b2f8 F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac -F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267 +F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4 F src/delete.c 2317c814866d9aa71fea16b3faf4fdd4d6a49b94 - F src/expr.c 6bab61c757c4c4c94a92e98d507025d5d18afd3c + F src/expr.c 4d89bd03a04fcdb5ff71d86b4e0cc7d3230797b8 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c 914a6bbd987d857c41ac9d244efa6641f36faadb -F src/func.c d7be77897c91d5b9887beb372f1e6deb515c92af +F src/func.c 5b064acd303b3e74f019ab551d423ff6cace4023 F src/global.c 5caf4deab621abb45b4c607aad1bd21c20aac759 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 @@@ -217,7 -217,7 +217,7 @@@ F src/random.c 0b2dbc37fdfbfa6bd455b091 F src/resolve.c 9d53899cc6e1f4ec0b4632d07e97d57827bf63b9 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 8b148eb851f384412aea57091659d14b369918ca - F src/shell.c f726500a48dbc64d42e82b439ca7690a1e1a46cf -F src/shell.c 250e4770afe136954088f0edcbc8ba76bcdb0e2e ++F src/shell.c dbe064d404bb497acd8a44c066cd6b8460a71236 F src/sqlite.h.in bd1451ba1ab681022a53bccc3c39580ba094a3ff F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc @@@ -290,7 -290,7 +290,7 @@@ F src/vtab.c 165ce0e797c2cd23badb104c9f F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73 - F src/where.c 6a82cd9edf3f53336489062531bff4c9f08d6d15 -F src/where.c ee148dd577aaef8a4b5923f6046e3074a1ddf130 ++F src/where.c e0b70ec707e208af37b436eaa829b038cc55e545 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 @@@ -1057,8 -1055,9 +1057,9 @@@ F test/whereD.test 6c2feb79ef1f68381b07 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f F test/whereF.test 136a7301512d72a08a272806c8767066311b7bc1 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31 -F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c +F test/wild001.test 384db4b30fbe82eaaefe8921f8a702c09e26db27 F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361 + F test/win32longpath.test f888106783fc26515f393c8848c94cd6166addbb F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688 F test/zerodamage.test 209d7ed441f44cc5299e4ebffbef06fd5aabfefd F tool/build-all-msvc.bat c55f64ca200308fb5fa5c1ee751ea95a13977b5a x @@@ -1107,7 -1106,7 +1108,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P 41c089e2a21f52b3d6d850eccba60be17010c9fe - R fd635dde5a0061c3bcc42dceb0b7a7e4 -P 945cb89ecb92a6c2075b3e58ce1ba3d419b1b6ca -R 8c92bd5c8e47ded17fee33a36ad92fa0 -U mistachkin -Z e27f33536507066f2096aabdddbccd7c ++P caab361ebee5f5c3fdafd9b1abe3d1ab7c5b4db9 ecd52ccf650ce2a4ab93c7c482289c1bc4768eeb ++R 11a68a0ec35d591bf742b2cdf1cfbf81 +U drh - Z f445406f63378451eee3ece49de14aa7 ++Z 9c29f776d777867b35099fa354ac7430 diff --cc manifest.uuid index 5370783404,fae0a2700a..5220527afb --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - caab361ebee5f5c3fdafd9b1abe3d1ab7c5b4db9 -ecd52ccf650ce2a4ab93c7c482289c1bc4768eeb ++12d0a8859de0a9d823997cfeccc77bd572cb6d13