From: drh Date: Wed, 2 Jun 2010 12:58:22 +0000 (+0000) Subject: Undo one of the "const" markers from the previous check-in because the X-Git-Tag: version-3.7.2~322 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0af3723478c42022fb0318b2deab3403abc2bd01;p=thirdparty%2Fsqlite.git Undo one of the "const" markers from the previous check-in because the value needs to be changable, even if it is not actually ever changed in the current implementation. FossilOrigin-Name: c24ac3563f46fc6bcf7e45ee171afd3ae7d2faa8 --- diff --git a/manifest b/manifest index 0a33c590a1..cc06d24cd5 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,8 @@ -C Add\ssome\s'const'\smarkers\sto\sstatic\sdata\sthat\sis\sreally\sconstant. -D 2010-06-02T05:53:53 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +C Undo\sone\sof\sthe\s"const"\smarkers\sfrom\sthe\sprevious\scheck-in\sbecause\sthe\nvalue\sneeds\sto\sbe\schangable,\seven\sif\sit\sis\snot\sactually\sever\schanged\sin\nthe\scurrent\simplementation. +D 2010-06-02T12:58:23 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -140,7 +143,7 @@ F src/mem1.c 89d4ea8d5cdd55635cbaa48ad53132af6294cbb2 F src/mem2.c 2ee7bdacda8299b5a91cff9f7ee3e46573195c38 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3 F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff -F src/memjournal.c 2293d6a7d4c61f0b84960e17bc793b77f4b3e452 +F src/memjournal.c f3be374af30588de297dcf678925b2a4758e4135 F src/mutex.c 6949180803ff05a7d0e2b9334a95b4fb5a00e23f F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6 F src/mutex_noop.c e6c3e448ac0514b27af1f8949f0347e4340f7af3 @@ -815,7 +818,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P fc18c4aadb908c3b6f9b6481a2efca6a0daadc64 -R 5ffcfe6f9fb26db002e380fdcd57427f -U dan -Z bd5e7f649e2a59b30633343e7bfa6f7f +P e7073e23b80e7cae0c76d42f014ee9b2d40a8f2f +R 73e4f4b33b6afd93e1d6ea7c71eaf278 +U drh +Z 14727fad5139f6047e9e78bb7ecc8f0d +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.6 (GNU/Linux) + +iD8DBQFMBlVyoxKgR168RlERAsd9AJsEGi7/nwDGdroJRIl/cONp0hYp+gCfVVUe +aYXll0IoKruBrR7/JYSyt9g= +=+Y9j +-----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 2ad0c2a1fa..9035a3f570 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e7073e23b80e7cae0c76d42f014ee9b2d40a8f2f \ No newline at end of file +c24ac3563f46fc6bcf7e45ee171afd3ae7d2faa8 \ No newline at end of file diff --git a/src/memjournal.c b/src/memjournal.c index d1454aed4f..f042475dc9 100644 --- a/src/memjournal.c +++ b/src/memjournal.c @@ -213,7 +213,7 @@ static int memjrnlFileSize(sqlite3_file *pJfd, sqlite_int64 *pSize){ /* ** Table of methods for MemJournal sqlite3_file object. */ -static const struct sqlite3_io_methods MemJournalMethods = { +static struct sqlite3_io_methods MemJournalMethods = { 1, /* iVersion */ memjrnlClose, /* xClose */ memjrnlRead, /* xRead */