Updates and clarification to the documentation of the sqlite3_temp_directory

global variable.  No changes to code. (CVS 6455)

FossilOrigin-Name: aea99c572a69a00b709f0de816ea16488d899375

diff --git a/manifest b/manifest
index d61905947b4400bb64c4bb93b6470be32086ec0b..5f938aa836963bfa926f269a33839908ebdd13d9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\s"default"\sto\sbe\sa\skeyword\sused\sby\sPRAGMA\sstatements.\s(CVS\s6454)
-D 2009-04-06T14:16:43
+C Updates\sand\sclarification\sto\sthe\sdocumentation\sof\sthe\ssqlite3_temp_directory\nglobal\svariable.\s\sNo\schanges\sto\scode.\s(CVS\s6455)
+D 2009-04-06T15:55:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -157,7 +157,7 @@ F src/resolve.c 094e44450371fb27869eb8bf679aacbe51fdc56d
 F src/rowset.c badb9f36b3a2ced9ee9551f4ce730f5fab442791
 F src/select.c 462d9671e91accd983110fa38674be0d2a3daa66
 F src/shell.c 0a11f831603f17fea20ca97133c0f64e716af4a7
-F src/sqlite.h.in 59905c98fd40b3eb3c9a939a113858c75009b7b6
+F src/sqlite.h.in 718a026b4cf3c766fc7ac5ff582faa60324b116c
 F src/sqlite3ext.h 1db7d63ab5de4b3e6b83dd03d1a4e64fef6d2a17
 F src/sqliteInt.h d1239060599bc45ed9e4668cb7759e6c433dd5ab
 F src/sqliteLimit.h ffe93f5a0c4e7bd13e70cd7bf84cfb5c3465f45d
@@ -715,7 +715,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P d8c6b28a734fccbbbd567d98ffa7e6557280f737
-R f0ce57456aa8766d0b9754cda1292c32
+P ed99d2d97f11784dda0f61f8e7d0eb5ca1bca371
+R abf940847e30d1ebd3eb1d24a60369a0
 U drh
-Z 60fbf9a0bf63c5f97922a6d6d1f7b8d9
+Z ee47436cb2cfecd95ac973d740f1311c

diff --git a/manifest.uuid b/manifest.uuid
index eba79d5f7005e934a56f8072cb0533b4fdd41d7d..d3ae6d6806e9931c4456a51da25c410cb2098dd0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed99d2d97f11784dda0f61f8e7d0eb5ca1bca371
\ No newline at end of file
+aea99c572a69a00b709f0de816ea16488d899375
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index d20448abe72d3df21d37dddb52c59183a035cd46..967e785f6f8d3240594cfb22a44db035a68055f4 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.439 2009/04/04 14:04:58 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.440 2009/04/06 15:55:04 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -3632,10 +3632,24 @@ int sqlite3_sleep(int);
 ** is a NULL pointer, then SQLite performs a search for an appropriate
 ** temporary file directory.
 **
-** It is not safe to modify this variable once a [database connection]
-** has been opened.  It is intended that this variable be set once
+** It is not safe to read or modify this variable in more than one
+** thread at a time.  It is not safe to read or modify this variable
+** if a [database connection] is being used at the same time in a separate
+** thread.
+** It is intended that this variable be set once
 ** as part of process initialization and before any SQLite interface
-** routines have been call and remain unchanged thereafter.
+** routines have been called and that this variable remain unchanged
+** thereafter.
+**
+** The [temp_store_directory pragma] may modify this variable and cause
+** it to point to memory obtained from [sqlite3_malloc].  Furthermore,
+** the [temp_store_directory pragma] always assumes that any string
+** that this variable points to is held in memory obtained from 
+** [sqlite3_malloc] and the pragma may attempt to free that memory
+** using [sqlite3_free].
+** Hence, if this variable is modified directly, either it should be
+** made NULL or made to point to memory obtained from [sqlite3_malloc]
+** or else the use of the [temp_store_directory pragma] should be avoided.
 */
 SQLITE_EXTERN char *sqlite3_temp_directory;