diff --git a/manifest b/manifest index 9650e8ccdb..57ea46afae 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Fix\san\sassertion\sfault\sthat\scan\sonly\soccur\sif\sSQLITE_ENABLE_STAT2\sis\sdefined\nand\sthe\sconstant\sfolding\soptimization\sis\sdisabled\susing\ssqlite3_test_control().\nProblem\sintroduced\sby\s[ad8bc68197f2b4]\sbut\swe\smissed\sit\sprior\sto\sthe\s3.7.4\nrelease\sdue\sto\staking\sshortcuts\sand\sskipping\stests\sin\sthe\srelease\schecklist. -D 2010-12-16T19:52:53 +C Improvements\sto\sthe\sdocumentation\sfor\ssqlite3_backup.\s\sNo\scode\schanges. +D 2010-12-16T20:35:09 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -179,7 +179,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7 F src/shell.c ee5905fef7bf8dfceaf31ee32db92a250c5acab4 -F src/sqlite.h.in eac5fdf313cd314b23093d70bf09b070e8f67919 +F src/sqlite.h.in 10703eabbc046241562e351db01867bfd6ee9511 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754 F src/sqliteInt.h b96d5ddb8b419a2ed7cf69a7778b53872d73e8a7 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44 @@ -897,14 +897,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P cf86affcb7d3089496e9849cbf43a211097e4f64 -R 3de2e9f1840abc5aa813c8670b73846d +P 70a3d81742fcd481f83ccc8f7ff6af58bc29c4fa +R 9519e6fa67e1334e4afcff3dd84c9457 U drh -Z 1060a236dbc52565455341e304a20640 +Z 293fd4f88c8d8f9ba51254632b1b2210 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFNCm4ZoxKgR168RlERAiUbAJ4qrpq7mstZk9+svbST+q1EKzcnqACfZcXk -mdsfy827moHN92mPMgDc9TQ= -=f2T1 +iD8DBQFNCngBoxKgR168RlERAsAFAJ4iiuLm7vklx4CB6wSiyiEwn4CjxgCeOsUX +lnxUFl9L9846F0vUhGk6SN0= +=SOu3 -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 51060b8537..7c38729052 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -70a3d81742fcd481f83ccc8f7ff6af58bc29c4fa \ No newline at end of file +f83609f4703b5e74a91bca071a4ac2843189f463 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 26c5591b05..18372c1692 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -5783,11 +5783,12 @@ typedef struct sqlite3_backup sqlite3_backup; ** ** See Also: [Using the SQLite Online Backup API] ** -** ^Exclusive access is required to the destination database for the -** duration of the operation. ^However the source database is only -** read-locked while it is actually being read; it is not locked -** continuously for the entire backup operation. ^Thus, the backup may be -** performed on a live source database without preventing other users from +** ^SQLite holds a write transaction open on the destination database file +** for the duration of the backup operation. +** ^The source database is read-locked only while it is being read; +** it is not locked continuously for the entire backup operation. +** ^Thus, the backup may be performed on a live source database without +** preventing other database connections from ** reading or writing to the source database while the backup is underway. ** ** ^(To perform a backup operation: @@ -5835,7 +5836,7 @@ typedef struct sqlite3_backup sqlite3_backup; ** the source and destination databases specified by [sqlite3_backup] object B. ** ^If N is negative, all remaining source pages are copied. ** ^If sqlite3_backup_step(B,N) successfully copies N pages and there -** are still more pages to be copied, then the function resturns [SQLITE_OK]. +** are still more pages to be copied, then the function returns [SQLITE_OK]. ** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages ** from source to destination, then it returns [SQLITE_DONE]. ** ^If an error occurs while running sqlite3_backup_step(B,N),