aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifest12
-rw-r--r--manifest.uuid2
-rw-r--r--src/sqlite.h.in15
3 files changed, 15 insertions, 14 deletions
diff --git a/manifest b/manifest
index 56470f0a8..190c86292 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sMakefile.in\sso\sthat\sit\sworks\swith\sthe\snew\sunicode\stokenizer\sof\sFTS3/4.\nUpdate\sthe\sversion\snumber\sto\s3.7.13.
-D 2012-05-28T15:32:09.872
+C Updates\sregarding\sURI\squery\sparameters\sand\sshared\scache\sin\sthe\sdocumentation\nderived\sfrom\scomments\sin\ssqlite.h.in.\s\sNo\schanges\sto\scode.
+D 2012-05-28T17:51:53.434
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/resolve.c b3c70ab28cac60de33684c9aa9e5138dcf71d6dd
F src/rowset.c f6a49f3e9579428024662f6e2931832511f831a1
F src/select.c f6c4833c4d8e94714761d99013d74f381e084f1d
F src/shell.c c16f72e34f611f060546709564c121a67cb2b31b
-F src/sqlite.h.in be400745291421efa0de9a8bace329de6d3544e2
+F src/sqlite.h.in 031d506fc8db023b64f15a4d7369ea0c5f51ee1e
F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
F src/sqliteInt.h 97ccae71ae0a4e924dcb9fab14eb4fc4839790da
F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 651520fa84ee0c488bef660bab9865500309d5e9
-R f3c8a67425dabbd564ab692dd7aa94a5
+P b8720d0416b8d4af7d131f1ddc3d280d196a9eda
+R 348c03cfec043fa2accf5b24f56b9e07
U drh
-Z 58dc5143c398d49dd07e91ba15cc103e
+Z 4dd2c323458ec95fb0cf85be25b240a2
diff --git a/manifest.uuid b/manifest.uuid
index d54167a7b..a78e9235f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8720d0416b8d4af7d131f1ddc3d280d196a9eda \ No newline at end of file
+bcc72d413e8db5fe8b32147ac22d406e2cd6bb60 \ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index bfaf70c79..85534870a 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -2571,18 +2571,20 @@ void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** present, then the VFS specified by the option takes precedence over
** the value passed as the fourth parameter to sqlite3_open_v2().
**
-** <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw" or
-** "rwc". Attempting to set it to any other value is an error)^.
+** <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
+** "rwc", or "memory". Attempting to set it to any other value is
+** an error)^.
** ^If "ro" is specified, then the database is opened for read-only
** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
** third argument to sqlite3_prepare_v2(). ^If the mode option is set to
** "rw", then the database is opened for read-write (but not create)
** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
** been set. ^Value "rwc" is equivalent to setting both
-** SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE. ^If sqlite3_open_v2() is
-** used, it is an error to specify a value for the mode parameter that is
-** less restrictive than that specified by the flags passed as the third
-** parameter.
+** SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE. ^If the mode option is
+** set to "memory" then a pure [in-memory database] that never reads or
+** or writes from disk is used. ^It is an error to specify a value for
+** the mode parameter that is less restrictive than that specified by
+** the flags passed in the third parameter to sqlite3_open_v2().
**
** <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
** "private". ^Setting it to "shared" is equivalent to setting the
@@ -4623,7 +4625,6 @@ void *sqlite3_update_hook(
/*
** CAPI3REF: Enable Or Disable Shared Pager Cache
-** KEYWORDS: {shared cache}
**
** ^(This routine enables or disables the sharing of the database cache
** and schema data structures between [database connection | connections]