diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4e6172dbca..61b981dab7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2012-10-11 19:52 UTC+0200 Viktor Szakats (harbour syenar.net) + * contrib/3rd/sqlite3/sqlite3.c + * contrib/3rd/sqlite3/sqlite3.dif + * contrib/3rd/sqlite3/sqlite3.h + * contrib/3rd/sqlite3/sqlite3.hbp + * sqlite3 updated. https://sqlite.org/releaselog/3_7_14_1.html + 2012-10-11 18:58 UTC+0200 Viktor Szakats (harbour syenar.net) * extras/rddado/adordd.prg * src/rtl/hbini.prg diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.c b/harbour/contrib/3rd/sqlite3/sqlite3.c index e138629da1..967f82734d 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.14. By combining all the individual C code files into this +** version 3.7.14.1. 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 @@ -673,9 +673,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.7.14" +#define SQLITE_VERSION "3.7.14.1" #define SQLITE_VERSION_NUMBER 3007014 -#define SQLITE_SOURCE_ID "2012-09-03 15:42:36 c0d89d4a9752922f9e367362366efde4f1b06f2a" +#define SQLITE_SOURCE_ID "2012-10-04 19:37:12 091570e46d04e84b67228e0bdbcd6e1fb60c6bdb" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -53858,6 +53858,9 @@ static void copyNodeContent(MemPage *pFrom, MemPage *pTo, int *pRC){ ** If aOvflSpace is set to a null pointer, this function returns ** SQLITE_NOMEM. */ +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) +#pragma optimize("", off) +#endif static int balance_nonroot( MemPage *pParent, /* Parent page of siblings being balanced */ int iParentIdx, /* Index of "the page" in pParent */ @@ -54488,6 +54491,9 @@ balance_cleanup: return rc; } +#if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM) +#pragma optimize("", on) +#endif /* @@ -106095,7 +106101,7 @@ static Bitmask codeOneLoopStart( } } pLevel->u.pCovidx = pCov; - pLevel->iIdxCur = iCovCur; + if( pCov ) pLevel->iIdxCur = iCovCur; if( pAndExpr ){ pAndExpr->pLeft = 0; sqlite3ExprDelete(pParse->db, pAndExpr); diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.dif b/harbour/contrib/3rd/sqlite3/sqlite3.dif index 985c2bb99c..f3aa167401 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 Tue Sep 04 22:03:06 2012 -+++ sqlite3\sqlite3.c Tue Sep 04 22:03:07 2012 +--- sqlite3.orig\sqlite3.c Thu Oct 11 19:37:32 2012 ++++ sqlite3\sqlite3.c Thu Oct 11 19:37:32 2012 @@ -26293,7 +26293,11 @@ ** is the same technique used by glibc to implement posix_fallocate() ** on systems that do not have a real fallocate() system call. diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.h b/harbour/contrib/3rd/sqlite3/sqlite3.h index 8c994c1e04..5a1f9d462a 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.14" +#define SQLITE_VERSION "3.7.14.1" #define SQLITE_VERSION_NUMBER 3007014 -#define SQLITE_SOURCE_ID "2012-09-03 15:42:36 c0d89d4a9752922f9e367362366efde4f1b06f2a" +#define SQLITE_SOURCE_ID "2012-10-04 19:37:12 091570e46d04e84b67228e0bdbcd6e1fb60c6bdb" /* ** CAPI3REF: Run-Time Library Version Numbers diff --git a/harbour/contrib/3rd/sqlite3/sqlite3.hbp b/harbour/contrib/3rd/sqlite3/sqlite3.hbp index 19f58f3863..20c5c735cf 100644 --- a/harbour/contrib/3rd/sqlite3/sqlite3.hbp +++ b/harbour/contrib/3rd/sqlite3/sqlite3.hbp @@ -45,8 +45,8 @@ sqlite3.c # ORIGIN http://www.sqlite.org/ -# VER 3.7.14 -# URL http://www.sqlite.org/sqlite-amalgamation-3071400.zip +# VER 3.7.14.1 +# URL http://www.sqlite.org/sqlite-amalgamation-3071401.zip # DIFF sqlite3.dif # # MAP sqlite3.c