From: drh Date: Thu, 24 Aug 2017 15:43:26 +0000 (+0000) Subject: Fixes to documentation about SQLITE_OPEN_URI. X-Git-Tag: version-3.21.0~129 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09e16491f603e4cdfa277d48a0989ba79ba4e396;p=thirdparty%2Fsqlite.git Fixes to documentation about SQLITE_OPEN_URI. FossilOrigin-Name: 7ec72314d6b66e4969833194fd032f01963bb861a7bb30d060acdb82dc5d62fe --- diff --git a/manifest b/manifest index 0da8256bdb..a5acff37b1 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\ssure\sthe\ssqlite3_result_pointer()\sinterface\sdoes\snot\sleave\sa\sVM\sregister\nin\san\sinconsistent\sstate.\s\sFix\sfor\sticket\s[7486aa54b968e9b5].\s\sTest\scases\nare\sin\sTH3. -D 2017-08-24T13:55:46.912 +C Fixes\sto\sdocumentation\sabout\sSQLITE_OPEN_URI. +D 2017-08-24T15:43:26.350 F Makefile.in c644bbe8ebe4aae82ad6783eae6b6beea4c727b99ff97568b847ced5e2ac7afb F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 25b154da7f0b3d4924f27378c1f8d006285b80811f1ccf3ed953dbebf6282136 @@ -459,7 +459,7 @@ F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c c9b3d8444bbf6f167d84f41ca6f3672e2521cb163a8c706b19058dc82fffe9b8 F src/shell.c 8f2a8b9e4ffe4f4596b1690dd628cd355d5605257e14ddba83daf5422e0e39af F src/shell.c.in b5725acacba95ccefa57b6d068f710e29ba8239c3aa704628a1902a1f729c175 -F src/sqlite.h.in 73a75cc53b5017525332ff3db2f74bb2607f1e8c0e8974d4afa3df3786f70aab +F src/sqlite.h.in a8e60396a73996a12a153299943f45fe59202c89bb1a46bab203a5e1b99b2493 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47 F src/sqliteInt.h bc0792db4ff887e4884d386188527e1cd7c16d496c8f3ba23333e68cee3e4f78 @@ -1650,7 +1650,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 59560d079fab4b91ec50855cc60349da178209c38fb6dae674ff874ccfc7f5fa -R f928c1195d839713ee78e6b46c1884f1 +P d2f9230c5c7ad6166e7d2b649f77960fa58b1cb583e529a43882753ab348413c +R 9289556db20d60c2fec8166d36acfa2c U drh -Z fae59aff59c16e3b9c2ad1cd0f0e8fa3 +Z 14ebde2517e2be2d793887e9fa413aa5 diff --git a/manifest.uuid b/manifest.uuid index c161e3d95e..64bb1d3ded 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d2f9230c5c7ad6166e7d2b649f77960fa58b1cb583e529a43882753ab348413c \ No newline at end of file +7ec72314d6b66e4969833194fd032f01963bb861a7bb30d060acdb82dc5d62fe \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 96d133b41c..d794e73eac 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3150,10 +3150,10 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*); ** ^If [URI filename] interpretation is enabled, and the filename argument ** begins with "file:", then the filename is interpreted as a URI. ^URI ** filename interpretation is enabled if the [SQLITE_OPEN_URI] flag is -** set in the fourth argument to sqlite3_open_v2(), or if it has +** set in the third argument to sqlite3_open_v2(), or if it has ** been enabled globally using the [SQLITE_CONFIG_URI] option with the ** [sqlite3_config()] method or by the [SQLITE_USE_URI] compile-time option. -** As of SQLite version 3.7.7, URI filename interpretation is turned off +** URI filename interpretation is turned off ** by default, but future releases of SQLite might enable URI filename ** interpretation by default. See "[URI filenames]" for additional ** information.