From 0dba5b534b70a0b23ed9748a75bc27862aab82d6 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Fri, 27 May 2011 06:15:28 +0000 Subject: [PATCH] 2011-05-27 08:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/3rd/sqlite3/sqlite3.c * contrib/3rd/sqlite3/sqlite3.dif * contrib/3rd/sqlite3/sqlite3.h * contrib/3rd/sqlite3/sqlite3.hbp * update sqlite to 3.7.6.3 [Tamas Tevesz] --- harbour/ChangeLog | 23 +++++++++++++++-------- harbour/contrib/3rd/sqlite3/sqlite3.c | 16 +++++++++++++--- harbour/contrib/3rd/sqlite3/sqlite3.dif | 4 ++-- harbour/contrib/3rd/sqlite3/sqlite3.h | 4 ++-- harbour/contrib/3rd/sqlite3/sqlite3.hbp | 4 ++-- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 007eb7409f..aacc267747 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2011-05-27 08:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/3rd/sqlite3/sqlite3.c + * contrib/3rd/sqlite3/sqlite3.dif + * contrib/3rd/sqlite3/sqlite3.h + * contrib/3rd/sqlite3/sqlite3.hbp + * update sqlite to 3.7.6.3 [Tamas Tevesz] + 2011-05-26 14:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/gtwvg/tests/wvgtbrowser.prg * contrib/gtwvg/tests/wvgutilities.prg @@ -41,14 +48,14 @@ * contrib/hbide/ideobject.prg + contrib/hbide/resources/memo.png + Added: option. - This is announced ChangeLog Manager which simply constructs + This is announced ChangeLog Manager which simply constructs the changelog entry and inserts at the top of specified - ChangeLog file. It is a work-in-progress and this is a just + ChangeLog file. It is a work-in-progress and this is a just initial commit, but can faily understand what I mean. 2011-05-25 12:48 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/gtwvg/wvgpaint.prg - ! Fixed: focus was not set to the window from where a modal + ! Fixed: focus was not set to the window from where a modal dialog was being initiated. Thanks Zoran Sibinovic for code example. 2011-05-25 12:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) @@ -64,10 +71,10 @@ + contrib/xhb/xhbtedit.prg * contrib/xhb/xhb.hbp * contrib/xhb/xhb.hbx - + borrowed complete extended TEDITOR() class from xhb. The code - looks very unclean and not Clipper compatible, so it will be - part of xhb. Contains fixes to make it compile under vanilla - Harbour with (default) high warning level. Plus some more + + borrowed complete extended TEDITOR() class from xhb. The code + looks very unclean and not Clipper compatible, so it will be + part of xhb. Contains fixes to make it compile under vanilla + Harbour with (default) high warning level. Plus some more basic code cleanups. Class was renamed to XHBEDITOR. 2011-05-25 15:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) @@ -14719,7 +14726,7 @@ except stripping the header part which is readded when the project is saved. The header part is comprised of : # - # $Id$ + # $Id # -3rd=hbide_* contents. diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.c b/harbour/contrib/3rd/sqlite3/sqlite3.c index 5c7fa363ea..5ee945c9b6 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.c +++ b/harbour/contrib/3rd/sqlite3/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.7.6.2. By combining all the individual C code files into this +** version 3.7.6.3. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -650,9 +650,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.6.2" +#define SQLITE_VERSION "3.7.6.3" #define SQLITE_VERSION_NUMBER 3007006 -#define SQLITE_SOURCE_ID "2011-04-17 17:25:17 154ddbc17120be2915eb03edc52af1225eb7cb5e" +#define SQLITE_SOURCE_ID "2011-05-19 13:26:54 ed1da510a239ea767a01dc332b667119fa3c908e" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -42078,11 +42078,21 @@ SQLITE_PRIVATE int sqlite3PagerCommitPhaseOne( }else{ if( pagerUseWal(pPager) ){ PgHdr *pList = sqlite3PcacheDirtyList(pPager->pPCache); + PgHdr *pPageOne = 0; + if( pList==0 ){ + /* Must have at least one page for the WAL commit flag. + ** Ticket [2d1a5c67dfc2363e44f29d9bbd57f] 2011-05-18 */ + rc = sqlite3PagerGet(pPager, 1, &pPageOne); + pList = pPageOne; + pList->pDirty = 0; + } + assert( pList!=0 || rc!=SQLITE_OK ); if( pList ){ rc = pagerWalFrames(pPager, pList, pPager->dbSize, 1, (pPager->fullSync ? pPager->syncFlags : 0) ); } + sqlite3PagerUnref(pPageOne); if( rc==SQLITE_OK ){ sqlite3PcacheCleanAll(pPager->pPCache); } diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.dif b/harbour/contrib/3rd/sqlite3/sqlite3.dif index 405cd86a31..7ca849454a 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.dif +++ b/harbour/contrib/3rd/sqlite3/sqlite3.dif @@ -1,6 +1,6 @@ diff -urN sqlite3.orig/sqlite3.c sqlite3/sqlite3.c ---- sqlite3.orig/sqlite3.c 2011-04-19 16:01:37.408190109 +0200 -+++ sqlite3/sqlite3.c 2011-04-19 16:01:37.528188662 +0200 +--- sqlite3.orig/sqlite3.c 2011-05-26 23:29:45.837407067 +0200 ++++ sqlite3/sqlite3.c 2011-05-26 23:29:45.977411381 +0200 @@ -24781,7 +24781,9 @@ case ENODEV: case ENXIO: diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.h b/harbour/contrib/3rd/sqlite3/sqlite3.h index 3b7eb94dda..85e916c5e5 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.h +++ b/harbour/contrib/3rd/sqlite3/sqlite3.h @@ -107,9 +107,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.6.2" +#define SQLITE_VERSION "3.7.6.3" #define SQLITE_VERSION_NUMBER 3007006 -#define SQLITE_SOURCE_ID "2011-04-17 17:25:17 154ddbc17120be2915eb03edc52af1225eb7cb5e" +#define SQLITE_SOURCE_ID "2011-05-19 13:26:54 ed1da510a239ea767a01dc332b667119fa3c908e" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp index 990de8e1e8..91f860a165 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp +++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp @@ -41,8 +41,8 @@ sqlite3.c # ORIGIN http://www.sqlite.org/ -# VER 3.7.6.2 -# URL http://www.sqlite.org/sqlite-amalgamation-3070602.zip +# VER 3.7.6.3 +# URL http://www.sqlite.org/sqlite-amalgamation-3070603.zip # DIFF sqlite3.dif # # MAP sqlite3.c