Corrections to the documented behavior of sqlite3_last_insert_rowid().

(This change is unrelated to the problem reported by Bram de Jong.  That
comes next.) (CVS 5149)

FossilOrigin-Name: 894085a59cdc60c34c8a3eb560d98bcb4a087cb1

diff --git a/manifest b/manifest
index d96063514697d6449b14640553650203d07e80b9..a78857a4c08137c5ca617fc9e4e4bfd653fa2572 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\sthe\serror\shandling\spolicies\sof\ssqlite3_exec()\sto\smake\sthem\nmore\sconsistent.\s\sChanges\sto\sthe\sdocumentation\son\sthe\serror\shandling\npolices\sof\ssqlite3_exec()\sso\sthat\sthe\sdocumentation\sand\scode\sagree.\s(CVS\s5148)
-D 2008-05-20T15:44:31
+C Corrections\sto\sthe\sdocumented\sbehavior\sof\ssqlite3_last_insert_rowid().\n(This\schange\sis\sunrelated\sto\sthe\sproblem\sreported\sby\sBram\sde\sJong.\s\sThat\ncomes\snext.)\s(CVS\s5149)
+D 2008-05-20T18:43:38
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 79aeba12300a54903f1b1257c1e7c190234045dd
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -130,7 +130,7 @@ F src/printf.c f2d4f6c5b0ec24b643e85fe60258adad8b1f6acc
 F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a
 F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8
 F src/shell.c a12ea645271b7876c8f080146f48e20b00d367ec
-F src/sqlite.h.in a7c0d013f1e7658d577f444c19401028bebefb8e
+F src/sqlite.h.in b953ce955c65c07a024212ff76863a5f98c33c79
 F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
 F src/sqliteInt.h 70a2b0bf856bbdb86b10d994ea863f6591ab7144
 F src/sqliteLimit.h f435e728c6b620ef7312814d660a81f9356eb5c8
@@ -636,7 +636,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 14226ff0a7af7b39a1089a17eeb5bbb8d09d778d
-R 1df4c3c30897afb9891ee14aa1e87dfb
+P a0376c7907db8e2993ce48e484001e981fbbb187
+R 41897067ca76c4aab67af0416a4c9951
 U drh
-Z 8a6ec6e166342e293c336a4411766224
+Z d730ec45afb5132bb2647dd3d3555a41

diff --git a/manifest.uuid b/manifest.uuid
index f64423666b72499982cc8afdd49a2cd2708d4f9e..4bed4eec8f161b4caff0f3b0fd797267f4709df3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a0376c7907db8e2993ce48e484001e981fbbb187
\ No newline at end of file
+894085a59cdc60c34c8a3eb560d98bcb4a087cb1
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 116bee7546e693019dde4026bbd68d671d93d8f7..06f61b077576630c4112cc5abe33dc4f8bf48f4c 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.314 2008/05/20 15:44:31 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.315 2008/05/20 18:43:38 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -849,11 +849,11 @@ struct sqlite3_vfs {
 **
 ** INVARIANTS:
 **
-** {F12201} Each new [database connection] has the 
+** {F12201} Each new [database connection] shall have the 
 **          [extended result codes] feature
 **          disabled by default.
 **
-** {F12202} The [sqlite3_extended_result_codes(D,F)] interface will enable
+** {F12202} The [sqlite3_extended_result_codes(D,F)] interface shall enable
 **          [extended result codes] for the 
 **          [database connection] D if the F parameter
 **          is true, or disable them if F is false.
@@ -899,8 +899,8 @@ int sqlite3_extended_result_codes(sqlite3*, int onoff);
 ** {F12221} The [sqlite3_last_insert_rowid()] function returns the
 **          rowid of the most recent successful insert done
 **          on the same database connection and within the same
-**          trigger context, or zero if there have
-**          been no qualifying inserts on that connection.
+**          or higher level trigger context, or zero if there have
+**          been no qualifying inserts.
 **
 ** {F12223} The [sqlite3_last_insert_rowid()] function returns
 **          same value when called from the same trigger context