From: drh <drh@noemail.net>
Date: Wed, 8 Sep 2010 02:30:27 +0000 (+0000)
Subject: Improved documentation of SQLITE_THREADSAFE and sqlite3_column_text() and
X-Git-Tag: experimental~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38c67c3683be190c25603a1fe843b62cd299e13b;p=thirdparty%2Fsqlite.git

Improved documentation of SQLITE_THREADSAFE and sqlite3_column_text() and
evidence marks for each.

FossilOrigin-Name: 0d7a53894866e536616e78473d253a9e9c29b1bc
---

diff --git a/manifest b/manifest
index ce72d905db..54814e3a16 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Updates\sto\sthe\sdocumentation\son\sthe\sVFS\sxOpen\smethod.
-D 2010-09-07T23:28:58
+C Improved\sdocumentation\sof\sSQLITE_THREADSAFE\sand\ssqlite3_column_text()\sand\nevidence\smarks\sfor\seach.
+D 2010-09-08T02:30:28
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -179,7 +179,7 @@ F src/select.c b0b124781474e4e0c8f64022875e5e2009e13443
 F src/shell.c 8517fc1f9c59ae4007e6cc8b9af91ab231ea2056
 F src/sqlite.h.in fef9e187420e234ecc45962f76dfb30065c3ba34
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
-F src/sqliteInt.h 4e31d3b58720d6251e08ba394641b9a63725eb8a
+F src/sqliteInt.h 81343db96497aebf81dff9c695dfd29699b377b3
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
 F src/status.c 496913d4e8441195f6f2a75b1c95993a45b9b30b
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -233,7 +233,7 @@ F src/vdbeInt.h a247bd5448039e83394bf4179975b2ae0092874c
 F src/vdbeapi.c bec07756e1b3ec5cd054ce8d32a80787763fd07e
 F src/vdbeaux.c de0b06b11a25293e820a49159eca9f1c51a64716
 F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
-F src/vdbemem.c 14439aa709d7e2e6cdb1407502ab06d551a9e384
+F src/vdbemem.c 2b8210992499e8b846f49fa4b0035bbc2cda0ee0
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c 0e8e0cb30dffb078367e843e84e37ef99236c7e4
 F src/wal.c 7081f148cb52b0cf2280e6384196402dc58130a3
@@ -860,14 +860,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 17be9beeab273a0fa84e107c674aee4cd83e6f79
-R 911573a8b1de1f57bea2cb134df5d756
+P 1719cb8f49bb138adcf8913a2d042f9e1360d78a
+R c02a8afe877c3b4735aad82e9e1cadd9
 U drh
-Z 4e226c87a5e40540185fa2e3098e796e
+Z dd26d0f574b1e7dcc096acc18183ba83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMhsq9oxKgR168RlERAgUeAJ9AEV+aEXE++4XScTgFHFNY8GKVOwCeOjKr
-h7Rvw0kRZ1G+pGZ0UIxeN1M=
-=y9+z
+iD8DBQFMhvVHoxKgR168RlERAv4lAJ9vCMPF+E5e9IKquuoenoU4ncqrVACfbdGF
+gqJcjtsQZK5C/LI3fg/MDHk=
+=+5zW
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index c36caa06db..97bca093a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1719cb8f49bb138adcf8913a2d042f9e1360d78a
\ No newline at end of file
+0d7a53894866e536616e78473d253a9e9c29b1bc
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 43d65d8763..32aef30398 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -114,15 +114,21 @@
 #endif
 
 /*
-** The SQLITE_THREADSAFE macro must be defined as either 0 or 1.
+** The SQLITE_THREADSAFE macro must be defined as 0, 1, or 2.
+** 0 means mutexes are permanently disable and the library is never
+** threadsafe.  1 means the library is serialized which is the highest
+** level of threadsafety.  2 means the libary is multithreaded - multiple
+** threads can use SQLite as long as no two threads try to use the same
+** database connection at the same time.
+**
 ** Older versions of SQLite used an optional THREADSAFE macro.
-** We support that for legacy
+** We support that for legacy.
 */
 #if !defined(SQLITE_THREADSAFE)
 #if defined(THREADSAFE)
 # define SQLITE_THREADSAFE THREADSAFE
 #else
-# define SQLITE_THREADSAFE 1
+# define SQLITE_THREADSAFE 1 /* IMP: R-07272-22309 */
 #endif
 #endif
 
diff --git a/src/vdbemem.c b/src/vdbemem.c
index 7171d7a0fd..da57438a0d 100644
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -961,7 +961,7 @@ const void *sqlite3ValueText(sqlite3_value* pVal, u8 enc){
         return 0;
       }
     }
-    sqlite3VdbeMemNulTerminate(pVal);
+    sqlite3VdbeMemNulTerminate(pVal); /* IMP: R-59893-45467 */
   }else{
     assert( (pVal->flags&MEM_Blob)==0 );
     sqlite3VdbeMemStringify(pVal, enc);