Fix bugs discovered in 3.1.4. F_FULLFSYNC not F_FULLSYNC. And a bug in

"make doc".  Also typos in the documentation. (CVS 2379)

FossilOrigin-Name: 3c57a4571fc8463ce9de1cbe5be45538bf2f0de9

diff --git a/Makefile.in b/Makefile.in
index 198a7877c1319a39558e7b41b2179f0bf822b882..904687d444fa3464752e858bd70a08675791f08e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -565,7 +565,6 @@ version3.html:      $(TOP)/www/version3.tcl
 #
 DOC = \
   arch.html \
-  arch.png \
   autoinc.html \
   c_interface.html \
   capi3.html \

diff --git a/VERSION b/VERSION
index 0aec50e6ede78cfcb00d159fc0932ce35a80cb87..3ad0595adcc26a4d1811520b2bc474ca92c11bb2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.4
+3.1.5

diff --git a/manifest b/manifest
index ddc27d31a297a8cbe1aa0a00ca458cc990a6390e..6a5d704d3183ff85cd7de858bb249940c160230a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Version\s3.1.4\s(CVS\s2378)
-D 2005-03-11T04:53:18
-F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
+C Fix\sbugs\sdiscovered\sin\s3.1.4.\s\sF_FULLFSYNC\snot\sF_FULLSYNC.\s\sAnd\sa\sbug\sin\n"make\sdoc".\s\sAlso\stypos\sin\sthe\sdocumentation.\s(CVS\s2379)
+D 2005-03-11T17:52:35
+F Makefile.in 5c00d0037104de2a50ac7647a5f12769795957a3
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
-F VERSION 3422d7d96d8d5d445bbc53e2d8fe46c5d3e7f156
+F VERSION 17b3754dfa10ebe4c97c88bc8499651ac1aff88a
 F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd
 F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2
 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
@@ -48,7 +48,7 @@ F src/os.h 0c805df3df02b98eb78a7a86756c3cbd4e190939
 F src/os_common.h 0e7f428ba0a6c40a61bc56c4e96f493231301b73
 F src/os_test.c 91e5f22dd89491e5e1554820e715805f43fa4ece
 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
-F src/os_unix.c 4fe368b6213f6734f767ca9aef65e873c810bf4e
+F src/os_unix.c d4823c6b3dd86e8cbb6a8f9d2fd6c4b3e722f8ee
 F src/os_unix.h 40b2fd1d02cfa45d6c3dea25316fd019cf9fcb0c
 F src/os_win.c bddeae1c3299be0fbe47077dd4e98b786a067f71
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
@@ -240,7 +240,7 @@ F www/autoinc.tcl b357f5ba954b046ee35392ce0f884a2fcfcdea06
 F www/c_interface.tcl b51b08591554c16a0c3ef718364a508ac25abc7e
 F www/capi3.tcl 7a7cc225fe02eb7ab861a6019b08baa0014409e1
 F www/capi3ref.tcl aec15cee5db96cd7ad5658b9988ee2730bf58f86
-F www/changes.tcl 167a925c072d5305a0741f71843d0c6a3d7081f0
+F www/changes.tcl dbace6eb8ecf10f5e7047d77115feb1742e56610
 F www/common.tcl de758130d54d95d151ea0d17a2ae5b92e1bb01de
 F www/compile.tcl 65b26bdfc964b66c5f0af841718a52f9795ceb05
 F www/conflict.tcl cdd0f4b59b0ba6d61f67e6a38f3ae45853bacb30
@@ -274,7 +274,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P ace3e30de1cde2e8990d8429b730ca5b68acd714
-R 52049a3f201fa25e282179868a0fb9fd
+P 3d070a9b4d680d952464b53b51e82b95982bbfca
+R 5bb016f13991b9bf4ca0f89c86911f2d
 U drh
-Z 55f765decaa431811f4dc12a35df932a
+Z d835048681c788a857d539c4c65412ce

diff --git a/manifest.uuid b/manifest.uuid
index 1dc46a44208069b7212db19f36c89e8b8859da79..6c82ef4effda666f0505a2811c4f365dcb3ae5c2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3d070a9b4d680d952464b53b51e82b95982bbfca
\ No newline at end of file
+3c57a4571fc8463ce9de1cbe5be45538bf2f0de9
\ No newline at end of file

diff --git a/src/os_unix.c b/src/os_unix.c
index 946cebc0c365feafa2198950680a2fbefc865160..97e3fe73bc95d58811c3731094dffc3e70ebfdf0 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -730,7 +730,7 @@ static int full_fsync(int fd, int fullSync){
 
 #ifdef F_FULLFSYNC
   if( fullSync ){
-    rc = fcntl(fd, F_FULLSYNC, 0);
+    rc = fcntl(fd, F_FULLFSYNC, 0);
   }else{
     rc = 1;
   }
@@ -739,7 +739,7 @@ static int full_fsync(int fd, int fullSync){
 
 #else
   rc = fsync(fd);
-#endif /* defined(F_FULLSYNC) */
+#endif /* defined(F_FULLFSYNC) */
 #endif /* defined(SQLITE_NO_SYNC) */
 
   return rc;
@@ -778,7 +778,7 @@ int sqlite3OsSync(OsFile *id){
 **
 ** This is used to make sure the master journal file has truely been deleted
 ** before making changes to individual journals on a multi-database commit.
-** The F_FULLSYNC option is not needed here.
+** The F_FULLFSYNC option is not needed here.
 */
 int sqlite3OsSyncDirectory(const char *zDirname){
   int fd;

diff --git a/www/changes.tcl b/www/changes.tcl
index 544f60385b8d532cf0aad655210b143dd7b092a7..3bf8b1e2cf958b4598a0817d52787e2abe7312a1 100644 (file)
--- a/www/changes.tcl
+++ b/www/changes.tcl
@@ -21,7 +21,12 @@ proc chng {date desc} {
   puts "<DD><P><UL>$desc</UL></P></DD>"
 }
 
-chng {2005 February 19 (3.1.4)} {
+chng {2005 March 11 (3.1.5)} {
+<li>The ioctl on OS-X to control syncing to disk is F_FULLFSYNC,
+    not F_FULLSYNC.  The previous release had it wrong.</li>
+}
+
+chng {2005 March 10 (3.1.4)} {
 <li>Fix a bug in autovacuum that could cause database corruption if
 a CREATE UNIQUE INDEX fails because of a constraint violation.
 This problem only occurs if the new autovacuum feature introduced in