From: drh Date: Fri, 11 Oct 2013 23:37:57 +0000 (+0000) Subject: Identify requirements text in the SQLITE_CONFIG_ documentation. Fix a typo X-Git-Tag: version-3.8.1~23 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf9fca4629cf0f6f0aac7e489c8737b7313354b5;p=thirdparty%2Fsqlite.git Identify requirements text in the SQLITE_CONFIG_ documentation. Fix a typo (a duplicated word) in part of that documentation. Add some requirements marks for DETACH to the test scripts. No code changes. FossilOrigin-Name: 1be0a3adaba2914c65c46fbebc4906ae4e70f899 --- diff --git a/manifest b/manifest index a9002040b9..1579b56e79 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\ssplit\samalgamation\soption\sshould\sbe\sdisabled\sby\sdefault. -D 2013-10-11T23:02:13.717 +C Identify\srequirements\stext\sin\sthe\sSQLITE_CONFIG_\sdocumentation.\s\sFix\sa\stypo\n(a\sduplicated\sword)\sin\spart\sof\sthat\sdocumentation.\s\sAdd\ssome\srequirements\nmarks\sfor\sDETACH\sto\sthe\stest\sscripts.\s\sNo\scode\schanges. +D 2013-10-11T23:37:57.890 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in e2d28ec95bd17ab4f3b6ee40b7102e9d7a0857b9 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -219,7 +219,7 @@ F src/resolve.c 5f15b00644c36a1610b87857abf42db38c07519c F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 15127b54cc11defb2cddef6914e1f384501a61c4 F src/shell.c 6f11f0e9ded63d48e306f2c6858c521e568a47bb -F src/sqlite.h.in ec40aa958a270416fb04b4f72210357bf163d2c5 +F src/sqlite.h.in 4c6eb96fded1d56a27cec04b6b6803789eb28f54 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc F src/sqliteInt.h eeebd2522bbd5ac7e3024be64113e8366caa66c8 @@ -320,7 +320,7 @@ F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0 F test/atof1.test 9bf1d25180a2e05fc12ce3940cc8003033642f68 F test/attach.test 0d112b7713611fdf0340260192749737135fda5f -F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966 +F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d F test/attach3.test d89ccfe4fe6e2b5e368d480fcdfe4b496c54cf4e F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0 @@ -782,7 +782,7 @@ F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879 F test/shared3.test fcd65cb11d189eff5f5c85cc4fad246fb0933108 F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9 -F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e +F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956 F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538 F test/shared9.test 5f2a8f79b4d6c7d107a01ffa1ed05ae7e6333e21 F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5 @@ -1123,7 +1123,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff -P 8ff17c553d8c159fa81c961441e16dbba8da62ba -R a87e0d5d722c6daa90ba9ca2073832b4 -U mistachkin -Z e20245d1470af628d2df5bb3da30e84f +P 7c24d22ffa1e12f3d24cad06b5ff7cc34219b2bb +R d7d2fd1a5883ae409ba0ba13e9010231 +U drh +Z a2b10bb03f0ef138962d7a6660a6c09c diff --git a/manifest.uuid b/manifest.uuid index f51646052b..8c5019e9e4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7c24d22ffa1e12f3d24cad06b5ff7cc34219b2bb \ No newline at end of file +1be0a3adaba2914c65c46fbebc4906ae4e70f899 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 1e5a3f22a4..2206704f4e 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -1612,27 +1612,27 @@ struct sqlite3_mem_methods { ** function must be threadsafe. ** ** [[SQLITE_CONFIG_URI]]
SQLITE_CONFIG_URI -**
This option takes a single argument of type int. If non-zero, then +**
^(This option takes a single argument of type int. If non-zero, then ** URI handling is globally enabled. If the parameter is zero, then URI handling -** is globally disabled. If URI handling is globally enabled, all filenames +** is globally disabled.)^ ^If URI handling is globally enabled, all filenames ** passed to [sqlite3_open()], [sqlite3_open_v2()], [sqlite3_open16()] or ** specified as part of [ATTACH] commands are interpreted as URIs, regardless ** of whether or not the [SQLITE_OPEN_URI] flag is set when the database -** connection is opened. If it is globally disabled, filenames are +** connection is opened. ^If it is globally disabled, filenames are ** only interpreted as URIs if the SQLITE_OPEN_URI flag is set when the -** database connection is opened. By default, URI handling is globally +** database connection is opened. ^(By default, URI handling is globally ** disabled. The default value may be changed by compiling with the -** [SQLITE_USE_URI] symbol defined. +** [SQLITE_USE_URI] symbol defined.)^ ** ** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]]
SQLITE_CONFIG_COVERING_INDEX_SCAN -**
This option takes a single integer argument which is interpreted as +**
^This option takes a single integer argument which is interpreted as ** a boolean in order to enable or disable the use of covering indices for -** full table scans in the query optimizer. The default setting is determined +** full table scans in the query optimizer. ^The default setting is determined ** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on" ** if that compile-time option is omitted. ** The ability to disable the use of covering indices for full table scans ** is because some incorrectly coded legacy applications might malfunction -** malfunction when the optimization is enabled. Providing the ability to +** when the optimization is enabled. Providing the ability to ** disable the optimization allows the older, buggy application code to work ** without change even with newer versions of SQLite. ** @@ -1661,16 +1661,16 @@ struct sqlite3_mem_methods { ** ** [[SQLITE_CONFIG_MMAP_SIZE]] **
SQLITE_CONFIG_MMAP_SIZE -**
SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values +**
^SQLITE_CONFIG_MMAP_SIZE takes two 64-bit integer (sqlite3_int64) values ** that are the default mmap size limit (the default setting for ** [PRAGMA mmap_size]) and the maximum allowed mmap size limit. -** The default setting can be overridden by each database connection using +** ^The default setting can be overridden by each database connection using ** either the [PRAGMA mmap_size] command, or by using the -** [SQLITE_FCNTL_MMAP_SIZE] file control. The maximum allowed mmap size +** [SQLITE_FCNTL_MMAP_SIZE] file control. ^(The maximum allowed mmap size ** cannot be changed at run-time. Nor may the maximum allowed mmap size ** exceed the compile-time maximum mmap size set by the -** [SQLITE_MAX_MMAP_SIZE] compile-time option. -** If either argument to this option is negative, then that argument is +** [SQLITE_MAX_MMAP_SIZE] compile-time option.)^ +** ^If either argument to this option is negative, then that argument is ** changed to its compile-time default. ** */ diff --git a/test/attach2.test b/test/attach2.test index db230723ab..f870568541 100644 --- a/test/attach2.test +++ b/test/attach2.test @@ -377,6 +377,9 @@ do_test attach2-6.2 { } } {1 {cannot ATTACH database within transaction}} +# EVIDENCE-OF: R-59740-55581 This statement will fail if SQLite is in +# the middle of a transaction. +# do_test attach2-6.3 { catchsql { DETACH aux; diff --git a/test/shared7.test b/test/shared7.test index 5c4a1da24c..9f4880f56e 100644 --- a/test/shared7.test +++ b/test/shared7.test @@ -23,6 +23,9 @@ do_test shared7-1.1 { sqlite3_enable_shared_cache } {1} +# EVIDENCE-OF: R-05098-06501 In shared cache mode, attempting to attach +# the same database file more than once results in an error. +# do_test shared7-1.2 { db close sqlite3 db test.db