Add a missing call to sqlite3PagerSync() removed by [ce552d975] to the backup code.

FossilOrigin-Name: 1965b85318c1fac62fae9691059021b298c17dde

diff --git a/manifest b/manifest
index dfb684e39065a920bb45aa5d588483e38a297b76..96c14ed460116a82810edd1a3ae19a8708a66dd1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Make\ssure\sthe\sreturn\scode\sfrom\sdoing\san\sxSync\sis\scorrectly\sinitialized\nso\sthat\sa\svalid\sreturn\scode\sis\sproduced\sregardless\sof\sthe\spath\staken\sthrough\nthe\slogic.
-D 2011-01-25T16:48:56.989
+C Add\sa\smissing\scall\sto\ssqlite3PagerSync()\sremoved\sby\s[ce552d975]\sto\sthe\sbackup\scode.
+D 2011-01-25T18:19:25
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -119,7 +116,7 @@ F src/alter.c 6a0c176e64a34929a4436048066a84ef4f1445b3
 F src/analyze.c a038162344265ac21dfb24b3fcc06c666ebb9c07
 F src/attach.c 252c4f7e36cc219349451ed63e278c60e80b26f3
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
-F src/backup.c 8c39a1ebba1e9dc385519cc4d434c7b0cab6638c
+F src/backup.c 6728d6d48d55b449af76a3e51c0808849cb32a2e
 F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
 F src/btree.c 9004c98fc576306eee4fc0562ffeb362ef53912c
@@ -900,14 +897,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 64914980855dbbf19512642836ca962a507b3ddb
-R 9dfb3a97b26cb66f3555d49b9adf879c
-U drh
-Z 00c400aa2e34e8badd39b4e9068a7ec7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFNPv77oxKgR168RlERAl9SAJwJ3rffv8HI7U1fymg0vldV7CNxRwCcDVQE
-5HWPR+CixXdxSOos4b+wQvs=
-=F9X2
------END PGP SIGNATURE-----
+P f12b5d76854c2f294ac60afe38a6dac37eb5b174
+R 085f3541c695880a57ad39b45c4ccb90
+U dan
+Z d44ae9b8b3c13e9672f7c0d2b1c1ba1f

diff --git a/manifest.uuid b/manifest.uuid
index 8c8888372362676b15dc9dc6e9c355f5efa8d4ee..dc04c747e59f653167a94546ede08df09d957b41 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f12b5d76854c2f294ac60afe38a6dac37eb5b174
\ No newline at end of file
+1965b85318c1fac62fae9691059021b298c17dde
\ No newline at end of file

diff --git a/src/backup.c b/src/backup.c
index 7258b26aa62b0389120858eadca52bfdc2589adb..5d8ea7f3fe67f958d4d7c8215965355fb44e0307 100644 (file)
--- a/src/backup.c
+++ b/src/backup.c
@@ -449,6 +449,16 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
               nDestTruncate==(int)(PENDING_BYTE_PAGE(p->pDest->pBt)-1)
            && iSize>=PENDING_BYTE && iSize<=PENDING_BYTE+pgszDest
         ));
+
+        /* This call ensures that all data required to recreate the original
+        ** database has been stored in the journal for pDestPager and the
+        ** journal synced to disk. So at this point we may safely modify
+        ** the database file in any way, knowing that if a power failure
+        ** occurs, the original database will be reconstructed from the 
+        ** journal file.  */
+        rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1);
+
+        /* Write the extra pages and truncate the database file as required. */
         iEnd = MIN(PENDING_BYTE + pgszDest, iSize);
         for(
           iOff=PENDING_BYTE+pgszSrc; 
@@ -465,10 +475,12 @@ int sqlite3_backup_step(sqlite3_backup *p, int nPage){
           sqlite3PagerUnref(pSrcPg);
         }
         if( rc==SQLITE_OK ){
-          rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 1);
-          if( rc==SQLITE_OK ){
-            rc = backupTruncateFile(pFile, iSize);
-          }
+          rc = backupTruncateFile(pFile, iSize);
+        }
+
+        /* Sync the database file to disk. */
+        if( rc==SQLITE_OK ){
+          rc = sqlite3PagerSync(pDestPager);
         }
       }else{
         rc = sqlite3PagerCommitPhaseOne(pDestPager, 0, 0);