Remove vestigal code from Makefile.linux-gcc. Ticket #2466. (CVS 4133)

FossilOrigin-Name: 338c18791006bac3709410087316700aad3b332f

diff --git a/Makefile.linux-gcc b/Makefile.linux-gcc
index c865024b4400e67557b8d4a2e423c00950a5ab95..b4d769914e527a1be735e2aaa36a7b342993e2b1 100644 (file)
--- a/Makefile.linux-gcc
+++ b/Makefile.linux-gcc
@@ -114,12 +114,6 @@ READLINE_FLAGS =
 LIBREADLINE =
 #LIBREADLINE = -static -lreadline -ltermcap
 
-#### Should the database engine assume text is coded as UTF-8 or iso8859?
-#
-# ENCODING  = UTF8
-ENCODING = ISO8859
-
-
 #### Which "awk" program provides nawk compatibilty
 #
 # NAWK = nawk

diff --git a/manifest b/manifest
index 2aad08a5fe7c03d54bcee72907c7d7d1bf7f7b05..8116f3c5a851bbff10e3db9c57e8e261b8d079b5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Reorganize\scomments\sin\sfts2_tokenizer.h.\sNo\scode\schanges.\s(CVS\s4132)
-D 2007-06-26T12:54:07
+C Remove\svestigal\scode\sfrom\sMakefile.linux-gcc.\s\sTicket\s#2466.\s(CVS\s4133)
+D 2007-06-26T22:10:12
 F Makefile.in 7f7485a4cc039476a42e534b3f26ec90e2f9753e
-F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
+F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION bd995b15c92d73ccf2f3e65d51702f88efea8001
 F aclocal.m4 d20ba55930a05197b484809fba1d2b603f4e67a6
@@ -97,7 +97,7 @@ F src/os_unix.c 113ae3557500a0a04f78b02bb1290262ede6bbf8
 F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
 F src/os_win.c d868d5f9e95ec9c1b9e2a30c54c996053db6dddd
 F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
-F src/pager.c 39352b58ee840cae715a4f0d20e446aa5e1445fe
+F src/pager.c 43e9bffb0ea6a76e06537790323c4a3e3a3a51cc
 F src/pager.h 94110a5570dca30d54a883e880a3633b2e4c05ae
 F src/parse.y ad2ce25665be7f7303137f774a4e3e72e0d036ff
 F src/pragma.c 7914a6b9ea05f158800116dfcae11e52ab8e39c4
@@ -516,7 +516,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P be2570c061e1e751d1a46450bd1186549146526e
-R 6fa498c7a241cebb5a9c89bb113f95f1
-U danielk1977
-Z ceb6a414b7b3e25a3dea78f60f54d2f2
+P b331e30395e9fc90abe40ab802972a67648cf48e
+R df414bc849f1ed27e2dc319f55de48c7
+U drh
+Z 78ad048e1d849654b6f1b7ae374a472e

diff --git a/manifest.uuid b/manifest.uuid
index d9411509de6b9e76a7da9dda10f24724098d4b10..ae50a45b07885dbefdaee2d7ff4ae5a98ecb9fa7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b331e30395e9fc90abe40ab802972a67648cf48e
\ No newline at end of file
+338c18791006bac3709410087316700aad3b332f
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 99c1f7934a32f5c2b1b86ee5e611bedd0ffd1f03..47568a406ba7ed2a1559a6774d6942d370ec7d2e 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.348 2007/06/18 17:25:18 drh Exp $
+** @(#) $Id: pager.c,v 1.349 2007/06/26 22:10:12 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -3878,7 +3878,6 @@ static int pager_incr_changecounter(Pager *pPager){
     /* Increment the value just read and write it back to byte 24. */
     change_counter++;
     put32bits(((char*)PGHDR_TO_DATA(pPgHdr))+24, change_counter);
-  
     /* Release the page reference. */
     sqlite3PagerUnref(pPgHdr);
     pPager->changeCountDone = 1;