Increase the iVersion for sqlite3_module needed for the xSavepoint,

xRelease, and xRollbackTo methods from 1 to 2.  This is so that it will
conform to published documentation.

FossilOrigin-Name: 0f4954e9793332573d4ffa0c1e199180f4cb990a

diff --git a/ext/fts3/fts3.c b/ext/fts3/fts3.c
index 6794e3d67e079b1e568bf8d42f423eec7ba92c21..5a46983d55a000b496d05a2857355fdfdf856db3 100644 (file)
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@@ -3661,7 +3661,7 @@ static int fts3RollbackToMethod(sqlite3_vtab *pVtab, int iSavepoint){
 }
 
 static const sqlite3_module fts3Module = {
-  /* iVersion      */ 1,
+  /* iVersion      */ 2,
   /* xCreate       */ fts3CreateMethod,
   /* xConnect      */ fts3ConnectMethod,
   /* xBestIndex    */ fts3BestIndexMethod,

diff --git a/manifest b/manifest
index 990f957862c42a8089657ccced8034fa0aba5cca..b1e07258d540ea62a42f1ec5ade81d8cf7d5d8b8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sincorrect\sassert()\sin\ssqlite3_value_config().\s\sUpdates\sto\sthe\nsqlite3_value_config()\sdocumentation.
-D 2011-05-05T23:07:43.483
+C Increase\sthe\siVersion\sfor\ssqlite3_module\sneeded\sfor\sthe\sxSavepoint,\nxRelease,\sand\sxRollbackTo\smethods\sfrom\s1\sto\s2.\s\sThis\sis\sso\sthat\sit\swill\nconform\sto\spublished\sdocumentation.
+D 2011-05-06T00:19:57.229
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -61,7 +61,7 @@ F ext/fts2/mkfts2amal.tcl 974d5d438cb3f7c4a652639262f82418c1e4cff0
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers 998756696647400de63d5ba60e9655036cb966e9
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 73d6718dba1e4ef621ff8a4ac1c22019460c84cc
+F ext/fts3/fts3.c 0077bd07395d2aabafa1ed1b104552619ecad34a
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h 8c2ac39ee17362571c58ab2c4f0667324c31f738
 F ext/fts3/fts3_aux.c 9e931f55eed8498dafe7bc1160f10cbb1a652fdf
@@ -179,7 +179,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
 F src/shell.c 72e7e176bf46d5c6518d15ac4ad6847c4bb5df79
-F src/sqlite.h.in 7f5ec849936098c5932b43fea2b1c5a4e1ec87b7
+F src/sqlite.h.in 7c70c29eb59e008b6aa46cdc2caf5e057c987496
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h e70a03bb66d209e279b3edeb57d4fdc42a1d9fda
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -244,7 +244,7 @@ F src/vdbeaux.c 25aa5ba7d46b4fe7c8f33dc132d474242d5f9726
 F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
 F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
 F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
-F src/vtab.c bfd252c7d699ccb1287bea3e5ca49eac2222beb0
+F src/vtab.c 48dcef8bc757c2e7b488f68b5ddebb1650da2450
 F src/wal.c 7334009b396285b658a95a3b6bc6d2b016a1f794
 F src/wal.h 7a5fbb00114b7f2cd40c7e1003d4c41ce9d26840
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
@@ -933,7 +933,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f0617d619dc6654f6d27543999c0aad724a0d967
-R 31cf9f23f5ca6aefc15da38ca5caec3a
+P 22cbc01a2600c6100112315d9afb5f2d8f80b3df
+R ecae535d3c90fbfa52eb2d1910d430f2
 U drh
-Z 536ce71311e8f997eb3d277fca3551df
+Z af2b86f0a254fd9cb92b70349edf3021

diff --git a/manifest.uuid b/manifest.uuid
index c09f6aed827f31fe46f9f70974118a432a43004c..59476c6ef82c65018b06e66d7879181f2146e1e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-22cbc01a2600c6100112315d9afb5f2d8f80b3df
\ No newline at end of file
+0f4954e9793332573d4ffa0c1e199180f4cb990a
\ No newline at end of file

diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index dfd794cf08c75bb113494599c87aeb64bf5159ce..ad424dbbf092fd368c2a544e498fb4b8fd069bcf 100644 (file)
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -4611,8 +4611,8 @@ struct sqlite3_module {
                        void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
                        void **ppArg);
   int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
-  /* The methods above are in version 0 of the sqlite_module object. Those 
-  ** below are for version 1 and greater. */
+  /* The methods above are in version 1 of the sqlite_module object. Those 
+  ** below are for version 2 and greater. */
   int (*xSavepoint)(sqlite3_vtab *pVTab, int);
   int (*xRelease)(sqlite3_vtab *pVTab, int);
   int (*xRollbackTo)(sqlite3_vtab *pVTab, int);

diff --git a/src/vtab.c b/src/vtab.c
index e7f7287da8d234a0f290f8529ae0ead0b9fc5b94..c64c897d07f98050e29279b62af4a5896f644255 100644 (file)
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -874,7 +874,7 @@ int sqlite3VtabSavepoint(sqlite3 *db, int op, int iSavepoint){
     int i;
     for(i=0; rc==SQLITE_OK && i<db->nVTrans; i++){
       const sqlite3_module *pMod = db->aVTrans[i]->pMod->pModule;
-      if( pMod->iVersion>=1 ){
+      if( pMod->iVersion>=2 ){
         int (*xMethod)(sqlite3_vtab *, int);
         switch( op ){
           case SAVEPOINT_BEGIN: