From: shane Date: Mon, 10 Nov 2008 19:24:38 +0000 (+0000) Subject: Updated comment in source. Ticket #3453. (CVS 5874) X-Git-Tag: version-3.6.10~303 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c782f69abb255c3c2b2aaf9e241b88294531a4aa;p=thirdparty%2Fsqlite.git Updated comment in source. Ticket #3453. (CVS 5874) FossilOrigin-Name: 83caa22087bcaa184eff559971262e4d7eecd0e0 --- diff --git a/manifest b/manifest index 500bce374c..52ea2dff2c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\scheck\sfor\sifcapable\sautovacuum\sto\svacuum2-3.3\stest.\sTicket\s#3435.\s(CVS\s5873) -D 2008-11-10T18:20:16 +C Updated\scomment\sin\ssource.\s\sTicket\s#3453.\s(CVS\s5874) +D 2008-11-10T19:24:38 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 48172b58e444a9725ec482e0c022a564749acab4 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -143,7 +143,7 @@ F src/pager.h 4a57b219c0765fe1870238064e3f46e4eb2cf5af F src/parse.y 2c4758b4c5ead6de8cf7112f5a7cce7561d313fe F src/pcache.c 5b80676e664019c1ebc8356cc25332dd69da6269 F src/pcache.h 2caf2deb6cbaa75c423b8b96fc1411069ee77c75 -F src/pragma.c e8b5a6a92fa51c14c887f6c8d48c62f374e19644 +F src/pragma.c 5d4333a27ef4f770fc69ca4f138419d3b462c554 F src/prepare.c ae49b8298eca79acdbc964679962e089b943ec94 F src/printf.c 785f87120589c1db672e37c6eb1087c456e6f84d F src/random.c a87afbd598aa877e23ac676ee92fd8ee5c786a51 @@ -395,7 +395,7 @@ F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916 F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe F test/journal1.test 36f2d1bb9bf03f790f43fbdb439e44c0657fab19 -F test/jrnlmode.test c2e8212a6f6d32f8fd8f869b93553154eaf2244c +F test/jrnlmode.test c4e4e40afdb6a128957e1f8ee404c8d670c4ce6f F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200 F test/like.test fef924922828d5a2a5bff80b9bdd9ff57a1ca500 @@ -654,7 +654,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P a11241d6fbc9e0408d5adc73d494b85124d2d609 -R 9554ff0c371842e72d3f4fc3b5fd82db +P fc36f2fc45b2d319ef0be97e1af1748d3e862690 +R ce58f3b04b0a351d5b10e989b8c3d40c U shane -Z 6625c24c71e5b290463502e727957390 +Z 50375b72b5602010a56aef20b01d8290 diff --git a/manifest.uuid b/manifest.uuid index bdcb9dc869..4a49fa325a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fc36f2fc45b2d319ef0be97e1af1748d3e862690 \ No newline at end of file +83caa22087bcaa184eff559971262e4d7eecd0e0 \ No newline at end of file diff --git a/src/pragma.c b/src/pragma.c index 0e464b920d..1e45202345 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id: pragma.c,v 1.192 2008/10/31 10:53:23 danielk1977 Exp $ +** $Id: pragma.c,v 1.193 2008/11/10 19:24:38 shane Exp $ */ #include "sqliteInt.h" #include @@ -455,7 +455,7 @@ void sqlite3Pragma( /* ** PRAGMA [database.]journal_mode - ** PRAGMA [database.]journal_mode = (delete|persist|memory|off) + ** PRAGMA [database.]journal_mode = (delete|persist|off|truncate|memory) */ if( sqlite3StrICmp(zLeft,"journal_mode")==0 ){ int eMode; diff --git a/test/jrnlmode.test b/test/jrnlmode.test index 29317220f6..78eda3228a 100644 --- a/test/jrnlmode.test +++ b/test/jrnlmode.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The focus # of these tests is the journal mode pragma. # -# $Id: jrnlmode.test,v 1.7 2008/10/17 18:51:53 danielk1977 Exp $ +# $Id: jrnlmode.test,v 1.8 2008/11/10 19:24:38 shane Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -121,7 +121,7 @@ ifcapable attach { PRAGMA aux2.journal_mode; } } {off memory memory} - do_test jrnlmode-1.11 { + do_test jrnlmode-1.13 { # The journal-mode used by in-memory databases cannot be changed. execsql { PRAGMA aux1.journal_mode = DELETE; @@ -132,7 +132,7 @@ ifcapable attach { PRAGMA aux2.journal_mode; } } {off memory memory} - do_test jrnlmode-1.12 { + do_test jrnlmode-1.14 { execsql { PRAGMA journal_mode = delete; } @@ -143,7 +143,7 @@ ifcapable attach { PRAGMA aux2.journal_mode; } } {delete delete memory memory} - do_test jrnlmode-1.13 { + do_test jrnlmode-1.15 { execsql { ATTACH ':memory:' as aux3; } @@ -155,7 +155,7 @@ ifcapable attach { PRAGMA aux3.journal_mode; } } {delete delete memory memory memory} - do_test jrnlmode-1.14 { + do_test jrnlmode-1.16 { execsql { PRAGMA journal_mode = TRUNCATE; } @@ -167,7 +167,7 @@ ifcapable attach { PRAGMA aux3.journal_mode; } } {truncate truncate memory memory memory} - + do_test jrnlmode-1.99 { execsql { DETACH aux1;