From: drh <drh@noemail.net>
Date: Thu, 2 Jun 2011 13:04:33 +0000 (+0000)
Subject: Merge the read-only shared memory branch into trunk.  After this merge, an
X-Git-Tag: version-3.7.7~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9afea68ff413eb102bdefe7e1ebad3a8474f839;p=thirdparty%2Fsqlite.git

Merge the read-only shared memory branch into trunk.  After this merge, an
unprivileged process can open WAL-mode databases owned by another user as
long as a database connection with write permission exists on the database
file and if the readonly_shm=1 URI query parameter is supplied.

FossilOrigin-Name: 19084a6641f77a62110b04ea50e298fe132ea784
---

c9afea68ff413eb102bdefe7e1ebad3a8474f839
diff --cc manifest
index 9e6489e647,b9fd02df11..f2e67cf931
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Avoid\sunnecessary\sduplication\sof\sSQL\sparameter\snames.
- D 2011-06-01T19:16:06.364
 -C Make\suse\sof\sthe\ssqlite3GetBoolean()\sinterface\sfor\smore\srobust\sprocessing\nof\sthe\sreadonly_shm\squery\sparameter\sinside\sof\sunixShmMap().
 -D 2011-06-01T20:13:36.269
++C Merge\sthe\sread-only\sshared\smemory\sbranch\sinto\strunk.\s\sAfter\sthis\smerge,\san\nunprivileged\sprocess\scan\sopen\sWAL-mode\sdatabases\sowned\sby\sanother\suser\sas\nlong\sas\sa\sdatabase\sconnection\swith\swrite\spermission\sexists\son\sthe\sdatabase\nfile\sand\sif\sthe\sreadonly_shm=1\sURI\squery\sparameter\sis\ssupplied.
++D 2011-06-02T13:04:33.467
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -938,7 -939,7 +939,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P b3aaf715b60b8a338cc6c92dad1ead4a3f7146a3
- R 018490a374b5cf414074a5a4bbd3de70
 -P d6b4709de4d1f8af001f58938247f00a652a616e
++P e704e8690ae35decc9769a45cf8d519ccad8b79d 1f930d7e04cd4a5ff3d91a0e9f1b62114f1cebd2
+ R fdd310892b7cea51b352170f4a152593
  U drh
- Z dcf10ad87997753baf45956f9011da61
 -Z cc8ff93f2b92f997226013b652879169
++Z c21bc600f09ce2bc60c48c66dd9bd252
diff --cc manifest.uuid
index de373954a3,203442f1d4..2a33332676
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e704e8690ae35decc9769a45cf8d519ccad8b79d
 -1f930d7e04cd4a5ff3d91a0e9f1b62114f1cebd2
++19084a6641f77a62110b04ea50e298fe132ea784