Documentation and test-script updates. (CVS 5249)

FossilOrigin-Name: 68d4f7954108f5bf586c4706c8664d8333fb2230

diff --git a/manifest b/manifest
index afe1540d19c0eae6a10aa1bf0363ddf3ca820681..47de40fed3a3296e92b49f89533309cb534b161d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sminor\scompile\sproblems.\s(CVS\s5248)
-D 2008-06-19T16:07:07
+C Documentation\sand\stest-script\supdates.\s(CVS\s5249)
+D 2008-06-19T17:54:33
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in ff6f90048555a0088f6a4b7406bed5e55a7c4eff
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -143,7 +143,7 @@ F src/printf.c 8b063da9dcde26b7c500a01444b718d86f21bc6e
 F src/random.c 5c754319d38abdd6acd74601ee0105504adc508a
 F src/select.c 669687459e7d0193c89de06c5dbed55b4a41191c
 F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec
-F src/sqlite.h.in cc64323ecc21320692c12726102976689ee5ae53
+F src/sqlite.h.in 379c716552d98527db1b1acc38d9d2164bba7956
 F src/sqlite3ext.h f162a72daef5ebf8b211fe8c0ec96e85d22fbf9b
 F src/sqliteInt.h 6dd55232e738a4dac23475cd4b0e444dff75c896
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -407,7 +407,7 @@ F test/malloc_common.tcl fd7040bbb0bbbe84187c7f80049fdf6b2a4d699b
 F test/manydb.test 8de36b8d33aab5ef295b11d9e95310aeded31af8
 F test/memdb.test a67bda4ff90a38f2b19f6c7f95aa7289e051d893
 F test/memleak.test d2d2a1ff7105d32dc3fdf691458cf6cba58c7217
-F test/memsubsys1.test 353d51691b0fbc10633ab61986d85a6b03cb0533
+F test/memsubsys1.test e3178f1235eece2e97d725d7ff261b37da6d97e5
 F test/minmax.test 5d56f08a7765dfb5c1fb303333f7444dacb37bef
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
 F test/minmax3.test 05110398e065875b3d9315892889d3c87fccfe2b
@@ -419,7 +419,7 @@ F test/misc5.test 0b68dcb630d44af2dbcdca94dd2b17c8d580f6fa
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
 F test/misc7.test 26e0d948a413bca61ed031159907a03d64647409
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
-F test/mutex1.test 9f493fa8663dc3e627e7e20a523873b1a20f0583
+F test/mutex1.test f643fe0753daaed30fa233a83e690f0cff9b596e
 F test/mutex2.test 6c8f4a5425a27088bc2ad107c71b7abbc2d8534d
 F test/nan.test 14c41572ff52dbc740b1c3303dd313a90dc6084c
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
@@ -600,7 +600,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 9d73a68c305db673d393db118b6a41241683a670
-R 89c080d7705fb747009452a0b592549a
+P 7d38da3eea9ce93f32e90fce0af5101e2cf12462
+R 267d5dcbcec5655f8a7bf7ef07b9ba94
 U drh
-Z 866325c54297cfb5a7889c7f7cecefe7
+Z 9d5c19f9eec6311440a093ba49ae5844

diff --git a/manifest.uuid b/manifest.uuid
index d038902461b09dca375a946543ae3f57dbf75b77..6bb38607c8a5ba8f5d8acfa2d3e53fae5daa506a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7d38da3eea9ce93f32e90fce0af5101e2cf12462
\ No newline at end of file
+68d4f7954108f5bf586c4706c8664d8333fb2230
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index f3c171b17eab313db248a4ed3a8dc3b370362973..434f4e0bc92d22352a341ad4a92bcda07edbfc5b 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.339 2008/06/19 08:51:24 danielk1977 Exp $
+** @(#) $Id: sqlite.h.in,v 1.340 2008/06/19 17:54:33 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -219,10 +219,20 @@ typedef sqlite_uint64 sqlite3_uint64;
 ** [prepared statements] and
 ** [sqlite3_blob_close | close] all [sqlite3_blob | BLOBs] 
 ** associated with the [sqlite3] object prior
-** to attempting to close the [sqlite3] object.
+** to attempting to close the [sqlite3] object.  The
+** [sqlite3_next_stmt()] interface can be used to locate all
+** [prepared statements] associated with a [database connection]
+** if desired.  Typical code might look like this:
 **
-** <todo>What happens to pending transactions?  Are they
-** rolled back, or abandoned?</todo>
+** <blockquote><pre>
+** sqlite3_stmt *pStmt;
+** while( (pStmt = sqlite3_next_stmt(db, 0))!=0 ){
+** &nbsp;   sqlite3_finalize(pStmt);
+** }
+** </pre></blockquote>
+**
+** If [sqlite3_close()] is invoked while a transaction is opened,
+** the transaction is automatically rolled back.
 **
 ** INVARIANTS:
 **
@@ -240,6 +250,10 @@ typedef sqlite_uint64 sqlite3_uint64;
 **
 ** {F12014} Giving sqlite3_close() a NULL pointer is a harmless no-op.
 **
+** {F12019} When [sqlite3_close()] is invoked on a [database connection]
+**          that has a pending transaction, the transaction shall be
+**          rolled back.
+**
 ** LIMITATIONS:
 **
 ** {U12015} The parameter to [sqlite3_close()] must be an [sqlite3] object
@@ -863,8 +877,8 @@ struct sqlite3_vfs {
 ** sqlite3_initialize() returns SQLITE_OK without doing any real work.
 **
 ** Among other things, sqlite3_initialize() shall invoke
-** [sqlite3_mutex_init()] and sqlite3_os_init().  Similarly, sqlite3_shutdown()
-** shall invoke [sqlite3_mutex_end()] and sqlite3_os_end().
+** sqlite3_os_init().  Similarly, sqlite3_shutdown()
+** shall invoke sqlite3_os_end().
 **
 ** The sqlite3_initialize() routine returns SQLITE_OK on success.
 ** If for some reason, sqlite3_initialize() is unable to initialize

diff --git a/test/memsubsys1.test b/test/memsubsys1.test
index cf36416f5c0381b86ff52d069d6dee0dd32fa6b6..f7db3941cc5e55594244f97026b9e8ad39f344b6 100644 (file)
--- a/test/memsubsys1.test
+++ b/test/memsubsys1.test
@@ -11,10 +11,11 @@
 #
 # This file contains tests of the memory allocation subsystem
 #
-# $Id: memsubsys1.test,v 1.1 2008/06/19 00:16:08 drh Exp $
+# $Id: memsubsys1.test,v 1.2 2008/06/19 17:54:33 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+sqlite3_reset_auto_extension
 
 # This procedure constructs a new database in test.db.  It fills
 # this database with many small records (enough to force multiple
@@ -220,5 +221,5 @@ do_test memsubsys1-7.7 {
   set s_ovfl [lindex [sqlite3_status SQLITE_STATUS_SCRATCH_OVERFLOW 0] 2]
 } 0
 
-
+autoinstall_test_functions
 finish_test

diff --git a/test/mutex1.test b/test/mutex1.test
index c8662507f67db20e7398b7aadb8e6139139bd168..24e27ed7851c2fa6f189dc6c06d7f04cdb5a6bc5 100644 (file)
--- a/test/mutex1.test
+++ b/test/mutex1.test
@@ -9,10 +9,11 @@
 #
 #***********************************************************************
 #
-# $Id: mutex1.test,v 1.3 2008/06/18 17:59:04 danielk1977 Exp $
+# $Id: mutex1.test,v 1.4 2008/06/19 17:54:33 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
+sqlite3_reset_auto_extension
 
 proc mutex_counters {varname} {
   upvar $varname var
@@ -127,5 +128,5 @@ do_test mutex1-X {
   sqlite3_initialize
 } {SQLITE_OK}
 
+autoinstall_test_functions
 finish_test
-