Updated documentation on sqlite3_temp_directory. No changes to code.

FossilOrigin-Name: e6225a7bf77a700b318563b1a854b4b3a9e031e1

diff --git a/manifest b/manifest
index f57975f5d310b5e7dd4dbc5d59394501f5a0134c..449ddf282d60837ac59dd4cbfc433b12f750a844 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\srunning\sANALYZE,\sit\sis\snot\snecessary\sto\scheck\sthe\sright-most\skey\scolumn\nfor\schanges\ssince\sthat\scolumn\swill\salways\schange\sif\snone\sof\sthe\sprevious\ncolumns\shave.
-D 2014-07-22T22:46:54.689
+C Updated\sdocumentation\son\ssqlite3_temp_directory.\s\sNo\schanges\sto\scode.
+D 2014-07-23T15:51:29.276
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -224,7 +224,7 @@ F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
 F src/shell.c 566aee8213372a2e81ba0eb34e9759f7b2574009
-F src/sqlite.h.in fd8e3a36b0aded082dc93a4b89c1e85324b4cf75
+F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
 F src/sqliteInt.h b72a09326d7cbd8375ec3d9a04ea5e0cf476beb3
@@ -1183,7 +1183,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 77f412caf0192d3e7fecb377d6d72123d8b64424
-R e38e472b4e4b7503ed49bdb3ca667f5c
+P 48f40861db4fbd10725a2b8b606d44fe16d5bd27
+R c881f4a63c48850e8a9fb96aa00a5db1
 U drh
-Z e390ae6bf708e4580525fb01df14fd1e
+Z cd8aaf55159956edb23d2b840f6a6165

diff --git a/manifest.uuid b/manifest.uuid
index 691fcc01d630ab3f9b477f2c33ac0afaf14ea628..470adaeeca7ae3f94276a79507bc5bf655a6b0ef 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48f40861db4fbd10725a2b8b606d44fe16d5bd27
\ No newline at end of file
+e6225a7bf77a700b318563b1a854b4b3a9e031e1
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 93cde78340c7bf5d3c9bfe461fa0b9348494f00a..67113dc418d3a19dc82b3f76ba7646f95e48f511 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4711,6 +4711,13 @@ int sqlite3_sleep(int);
 ** is a NULL pointer, then SQLite performs a search for an appropriate
 ** temporary file directory.
 **
+** Applications are strongly discouraged from using this global variable.
+** It is required to set a temporary folder on Windows Runtime (WinRT).
+** But for all other platforms, it is highly recommended that applications
+** neither read nor write this variable.  This global variable is a relic
+** that exists for backwards compatibility of legacy applications and should
+** be avoided in new projects.
+**
 ** 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
@@ -4729,6 +4736,11 @@ int sqlite3_sleep(int);
 ** 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.
+** Except when requested by the [temp_store_directory pragma], SQLite
+** does not free the memory that sqlite3_temp_directory points to.  If
+** the application wants that memory to be freed, it must do
+** so itself, taking care to only do so after all [database connection]
+** objects have been destroyed.
 **
 ** <b>Note to Windows Runtime users:</b>  The temporary directory must be set
 ** prior to calling [sqlite3_open] or [sqlite3_open_v2].  Otherwise, various