Improved logging of master-journal name conflicts.

FossilOrigin-Name: b1005ef46cc2b46dd8e448ae1a9a9508bd5666ab

diff --git a/manifest b/manifest
index 9d87384e8d431036d48fae6ec2b7b95952d01c4b..cbedf29e4bd88a067f472950aad3f204a994cb52 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\snx-devkit\schanges\sinto\strunk.
-D 2011-12-16T13:42:03.408
+C Improved\slogging\sof\smaster-journal\sname\sconflicts.
+D 2011-12-16T15:11:39.468
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5b4a3e12a850b021547e43daf886b25133b44c07
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -244,7 +244,7 @@ F src/vdbe.c 029add0c5197a61db588824a58570547330b9d8f
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 48c158b2fceca9682d1577e61c62da3c58cf0748
 F src/vdbeapi.c 86189ebba2c49791d75eaa12929f3ce6527596bd
-F src/vdbeaux.c 4a96cddec7c8cc33f98da703c1baf2a654b50cab
+F src/vdbeaux.c 3015179b27672cb773d014495023eaa4a8cd8f9c
 F src/vdbeblob.c 32f2a4899d67f69634ea4dd93e3f651936d732cb
 F src/vdbemem.c 2fc78b3e0fabcc1eaa23cd79dd2e30e6dcfe1e56
 F src/vdbesort.c 468d43c057063e54da4f1988b38b4f46d60e7790
@@ -983,7 +983,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 322bd15f97143d39b3a88d5f6cf7afb454e0666e bb40338887c912be70cb6fe3b760d87c14bb88a5
-R a70f90ef372516f64947505d1ba22869
+P cf3bccc2e944cd2dd3efb8554682994a06115f16
+R 9cdd098939326e460c36a0ff01e82e7f
 U drh
-Z a2e5ef34107012b45c32946167d7851d
+Z f579d2bc7a13e23fcc9e8ceaf02a267f

diff --git a/manifest.uuid b/manifest.uuid
index d3c7f87bf80aed9404b4e4fe48baffb073bacfb2..b02a3e69b10d2b50014e839e07a1281a016698de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cf3bccc2e944cd2dd3efb8554682994a06115f16
\ No newline at end of file
+b1005ef46cc2b46dd8e448ae1a9a9508bd5666ab
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index aa024ca54e0de1f2ff4e9d2dd72a1d2168e4040d..c7d46a1bc1872e92bfabf71d840cd0aace01d839 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -1842,11 +1842,16 @@ static int vdbeCommit(sqlite3 *db, Vdbe *p){
     if( zMaster==0 ) return SQLITE_NOMEM;
     do {
       u32 iRandom;
-      if( retryCount++>100 ){
-        sqlite3_log(SQLITE_FULL, "cannot find unique master-journal");
-        sqlite3OsDelete(pVfs, zMaster, 0);
-        break;
+      if( retryCount ){
+        if( retryCount>100 ){
+          sqlite3_log(SQLITE_FULL, "MJ delete: %s", zMaster);
+          sqlite3OsDelete(pVfs, zMaster, 0);
+          break;
+        }else if( retryCount==1 ){
+          sqlite3_log(SQLITE_FULL, "MJ collide: %s", zMaster);
+        }
       }
+      retryCount++;
       sqlite3_randomness(sizeof(iRandom), &iRandom);
       sqlite3_snprintf(13, &zMaster[nMainFile], "-mj%06X9%02X",
                                (iRandom>>8)&0xffffff, iRandom&0xff);