Silently ignore errors trying to set the default journal_mode while doing

an ATTACH.

FossilOrigin-Name: b9af4ad2efadfb2fb9e338dc081a6231f1536700
This commit is contained in:
drh
2010-05-15 01:09:38 +00:00
parent ff59a114bd
commit 89c3f2ff43
3 changed files with 12 additions and 11 deletions
+9 -9
View File
@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Fix\sa\stypo\sthat\s(by\sbad\sluck)\swas\snot\sa\ssyntax\serror\sbut\swhich\scaused\ssome\s\nimportant\slines\sof\scode\sto\sbe\sskipped\swhen\sSQLITE_DEBUG\swas\snot\sused.
D 2010-05-14T20:15:52
C Silently\signore\serrors\strying\sto\sset\sthe\sdefault\sjournal_mode\swhile\sdoing\nan\sATTACH.
D 2010-05-15T01:09:39
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -218,7 +218,7 @@ F src/update.c 9859f2056c7739a1db0d9774ccb6c2f0cee6d1de
F src/utf.c 1baeeac91707a4df97ccc6141ec0f808278af685
F src/util.c 32aebf04c10e51ad3977a928b7416bed671b620b
F src/vacuum.c b17355fc10cef0875626932ec2f1fa1deb0daa48
F src/vdbe.c 8c6301a7dd844d2d6370ebd46f4e2d0cf449c2de
F src/vdbe.c 950cd4e9dfeec3066251897c1ff89331df38b625
F src/vdbe.h 471f6a3dcec4817ca33596fe7f6654d56c0e75f3
F src/vdbeInt.h 19ebc8c2a2e938340051ee65af3f377fb99102d1
F src/vdbeapi.c dc3138f10afbc95ed3c21dd25abb154504b1db9d
@@ -816,14 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 636f86095eb1f4bdcfb0c9ed846c4c6b3589c10b
R 558bf448fe44d9f4c7e50674a4eb1b9a
P 9ef99d97d25aae81df971d40ad10c544b8f30053
R 961b4b6943a386936b4f6cb172249d24
U drh
Z 49cd06a7ecd237b4b83de5a297f735b7
Z afe994fde406afebdf78e209bed2468a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL7a96oxKgR168RlERAlBFAJ4gQzTgKsFA7Kf8x9yz/aJ+mNirnACeONZz
cbmZZNbwKdAsItvtiumzqH0=
=2ueH
iD8DBQFL7fRWoxKgR168RlERAoyCAJ9K9uVNPZcIs/A8LqoY6XKLaZYBWgCfZ1BC
jNrGvYwg0uJo5GwqeN+58+U=
=QeSc
-----END PGP SIGNATURE-----
+1 -1
View File
@@ -1 +1 @@
9ef99d97d25aae81df971d40ad10c544b8f30053
b9af4ad2efadfb2fb9e338dc081a6231f1536700
+2 -1
View File
@@ -5293,7 +5293,8 @@ case OP_JournalMode: { /* out2-prerelease */
rc = sqlite3BtreeSetVersion(pBt,
(eNew==PAGER_JOURNALMODE_WAL ? 2 : 1));
if( rc==SQLITE_BUSY && pOp->p5==0 ) goto abort_due_to_error;
}else if( rc==SQLITE_BUSY ){
}
if( rc==SQLITE_BUSY ){
eNew = PAGER_JOURNALMODE_QUERY;
rc = SQLITE_OK;
}